From 29d869ee086c58fc9325aceee335a9178c11278d Mon Sep 17 00:00:00 2001
From: unknown <df@pippilotta.erinye.com>
Date: Fri, 4 May 2007 09:42:46 +0200
Subject: 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
---
 CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'CMakeLists.txt')

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") 
-- 
cgit v1.2.1