Changeset 7818 for code/trunk/cmake/CompilerConfigMSVC.cmake

Timestamp:

Dec 26, 2010, 9:07:43 PM (14 years ago)

Author:

rgrieder

Message:

Merged changes related to Visual Leak Detector and source file handling from sandbox QT to trunk.

File:

• code/trunk/cmake/CompilerConfigMSVC.cmake (modified) (2 diffs)

code/trunk/cmake/CompilerConfigMSVC.cmake

@@ -35 +35 @@
 
 ######################## Options ########################
-
-# Currently VLD has a problem with MSVC9 although it actually is supported
-IF(MSVC80)
-  OPTION(VISUAL_LEAK_DETECTOR_ENABLE "Memory leak detector" off)
-ENDIF()
-# Make sure the value is "on" or "off" for vld.ini
-IF(VISUAL_LEAK_DETECTOR_ENABLE)
-  SET(VISUAL_LEAK_DETECTOR_ENABLE on)
-ELSE()
-  SET(VISUAL_LEAK_DETECTOR_ENABLE off)
-ENDIF()
 
 # Orxonox only supports MSVC 8 and above, which gets asserted above
@@ -159 +148 @@
 IF(ORXONOX_RELEASE)
   ADD_LINKER_FLAGS("-INCREMENTAL:NO -OPT:ICF -OPT:REF -LTCG" ReleaseAll   CACHE)
+  # Static linker flags have to be added manually to a target
+  SET(ORXONOX_STATIC_LINKER_FLAGS "/LTCG")
 ELSE()
   ADD_LINKER_FLAGS("-INCREMENTAL:YES"                  RelWithDebInfo     CACHE)