diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-05-04 09:42:46 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-05-04 09:42:46 +0200 |
| commit | 22ae0985ea934023543b772401e2e99175706cf1 (patch) | |
| tree | 2e89650d89e8bf10ea31380a009e3cbef51c60de /CMakeLists.txt | |
| parent | c8c5d4b1007e3c6b1e71551438515372143dda0b (diff) | |
| download | mariadb-git-22ae0985ea934023543b772401e2e99175706cf1.tar.gz | |
BUG#24732 manifest file was not included in VS2005 amd64 builds (5.1 tree version)
CMakeLists.txt:
BUG#24732 prevent VS2005 from overwriting our generated manifest
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 02755c5d138..bb5e53be20e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,6 +153,11 @@ IF(EMBED_MANIFESTS) # Disable automatic manifest generation. STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}) + # Explicitly disable it since it is the default for newer versions of VS + STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS}) + IF(NOT tmp_manifest) + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO") + ENDIF(tmp_manifest) # Set the processor architecture. IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") SET(PROCESSOR_ARCH "X64") |