diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
| commit | a22c8c5be5ceadd23eed707ae2f1308ced2de977 (patch) | |
| tree | 796cc97d1d103e18e0672d9b57dee4c54857073c /CMakeLists.txt | |
| parent | 510835a0727fc1ebe98e2808cae91c8ab014d27e (diff) | |
| parent | 585cf08fe6a8d6e237732daa94a969f93e5c84ec (diff) | |
| download | mariadb-git-a22c8c5be5ceadd23eed707ae2f1308ced2de977.tar.gz | |
Merge MySQL 5.1.35 into MySQL 5.4
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bb50cbade3..6a41496f120 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,7 +144,13 @@ IF(MSVC) STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT ${CMAKE_CXX_FLAGS_INIT}) STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT}) - + + # Mark 32 bit executables large address aware so they can + # use > 2GB address space + IF(CMAKE_SIZEOF_VOID_P MATCHES 4) + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE") + ENDIF(CMAKE_SIZEOF_VOID_P MATCHES 4) + # Disable automatic manifest generation. STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}) |