diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-05-04 09:46:33 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-05-04 09:46:33 +0200 |
| commit | 242dcb3b780241c7566b1ce4beedad2d3b2f0dd3 (patch) | |
| tree | d999299c6d4be05dff37a4ca9cd62ee4a2c84c20 | |
| parent | 4b0cf99a5cbd184fd7ba1bcb0eedaa413ed6e44b (diff) | |
| download | mariadb-git-242dcb3b780241c7566b1ce4beedad2d3b2f0dd3.tar.gz | |
backport a manifest fix
CMakeLists.txt:
backported fix
| -rwxr-xr-x | CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cde3e222ec..11f9100b7ad 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,6 +150,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") |