[Orxonox-commit 2734] r7439 - sandbox_qt/cmake

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-09-13 01:30:28 +0200 (Mon, 13 Sep 2010)
New Revision: 7439

Modified:
   sandbox_qt/cmake/CompilerConfigMSVC.cmake
Log:
Fixed MSVC linker flag handling.

Modified: sandbox_qt/cmake/CompilerConfigMSVC.cmake
===================================================================
--- sandbox_qt/cmake/CompilerConfigMSVC.cmake	2010-09-12 22:16:48 UTC (rev 7438)
+++ sandbox_qt/cmake/CompilerConfigMSVC.cmake	2010-09-12 23:30:28 UTC (rev 7439)
@@ -148,14 +148,16 @@
 
 # CMake default flags: -MANIFEST -STACK:10000000 -machine:I386
 # and INCREMENTAL and DEBUG for debug versions
-ADD_LINKER_FLAGS("-OPT:REF -OPT:ICF" Release MinSizeRel CACHE)
+SET_LINKER_FLAGS("-debug -INCREMENTAL:YES" Debug              CACHE)
+SET_LINKER_FLAGS("-debug"                  RelWithDebInfo     CACHE)
+SET_LINKER_FLAGS(""                        Release MinSizeRel CACHE)
+
 ADD_LINKER_FLAGS("-OPT:NOWIN98" MSVC80 CACHE)
-REMOVE_LINKER_FLAGS("-INCREMENTAL:NO"  RelWithDebInfo CACHE)
-ADD_LINKER_FLAGS   ("-INCREMENTAL:YES" RelWithDebInfo CACHE)
 
 # Use Link time code generation for Release config if ORXONOX_RELEASE is defined
 IF(ORXONOX_RELEASE)
-  REMOVE_LINKER_FLAGS("-INCREMENTAL:YES" ReleaseAll CACHE)
-  ADD_LINKER_FLAGS   ("-INCREMENTAL:NO"  ReleaseAll CACHE)
-  ADD_LINKER_FLAGS   ("-LTCG"            ReleaseAll CACHE)
+  ADD_LINKER_FLAGS("-INCREMENTAL:NO -OPT:ICF -OPT:REF -LTCG" ReleaseAll   CACHE)
+ELSE()
+  ADD_LINKER_FLAGS("-INCREMENTAL:YES"                  RelWithDebInfo     CACHE)
+  ADD_LINKER_FLAGS("-INCREMENTAL:NO -OPT:ICF -OPT:REF" Release MinSizeRel CACHE)
 ENDIF()