[Orxonox-commit 2428] r7137 - code/branches/presentation3/cmake

rgrieder at orxonox.net rgrieder at orxonox.net
Thu Jun 10 00:58:41 CEST 2010


Author: rgrieder
Date: 2010-06-10 00:58:40 +0200 (Thu, 10 Jun 2010)
New Revision: 7137

Modified:
   code/branches/presentation3/cmake/TargetUtilities.cmake
Log:
Prevent possible bug if target already has compile flags.

Modified: code/branches/presentation3/cmake/TargetUtilities.cmake
===================================================================
--- code/branches/presentation3/cmake/TargetUtilities.cmake	2010-06-09 22:55:47 UTC (rev 7136)
+++ code/branches/presentation3/cmake/TargetUtilities.cmake	2010-06-09 22:58:40 UTC (rev 7137)
@@ -207,7 +207,11 @@
   # (IntelliSense stops working when adding "-Zm1000" as compile flag. "/Zm1000"
   # would not work because of the slash)
   IF(_arg_ORXONOX_EXTERNAL AND MSVC)
-    SET_TARGET_PROPERTIES(${_target_name} PROPERTIES COMPILE_FLAGS "-Zm1000")
+    GET_TARGET_PROPERTY(_compile_flags ${_target_name} COMPILE_FLAGS)
+    IF(NOT _compile_flags)
+      SET(_compile_flags)
+    ENDIF()
+    SET_TARGET_PROPERTIES(${_target_name} PROPERTIES COMPILE_FLAGS "${_compile_flags} -Zm1000")
   ENDIF()
 
   # MODULE B




More information about the Orxonox-commit mailing list