diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-02-25 17:02:34 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-02-25 17:02:34 +0100 |
| commit | 1ee71946627674115a4901e284030adf636c4b53 (patch) | |
| tree | 94023218ee39759f95677f30eec8c233dd3861bd /CMakeLists.txt | |
| parent | 89fbca28135f6e0bc4998381c08a9028f671ca1d (diff) | |
| parent | 1a11c2236fa096b8f9618cb4e5ffbf3d5add2787 (diff) | |
| download | mariadb-git-1ee71946627674115a4901e284030adf636c4b53.tar.gz | |
merge fix for 43082 from 5.0-bugteam
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 0657013089b..7c173c9cb49 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}) |