[Orxonox-commit 2743] r7448 - code/trunk/cmake/tools

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-09-13 15:14:52 +0200 (Mon, 13 Sep 2010)
New Revision: 7448

Modified:
   code/trunk/cmake/tools/GetGCCCompilerFlags.cmake
   code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake
Log:
DEFINE_SYMBOL property is only added to compile flags for an executable.

Modified: code/trunk/cmake/tools/GetGCCCompilerFlags.cmake
===================================================================
--- code/trunk/cmake/tools/GetGCCCompilerFlags.cmake	2010-09-13 13:14:25 UTC (rev 7447)
+++ code/trunk/cmake/tools/GetGCCCompilerFlags.cmake	2010-09-13 13:14:52 UTC (rev 7448)
@@ -57,7 +57,10 @@
   GET_DIRECTORY_PROPERTY(_directory_defs_build_type      COMPILE_DEFINITIONS_${_build_type_upper})
   GET_TARGET_PROPERTY(_target_defs            ${_target} COMPILE_DEFINITIONS)
   GET_TARGET_PROPERTY(_target_defs_build_type ${_target} COMPILE_DEFINITIONS_${_build_type_upper})
-  GET_TARGET_PROPERTY(_target_def_symbol      ${_target} DEFINE_SYMBOL)
+  IF(${_target_type} STREQUAL SHARED_LIBRARY)
+    GET_TARGET_PROPERTY(_target_def_symbol    ${_target} DEFINE_SYMBOL)
+  ENDIF()
+
   # Prefix them all with a "-D" if the property was found
   FOREACH(_def ${_directory_defs} ${_directory_defs_build_type} ${_target_defs}
                ${_target_defs_build_type} ${_target_def_symbol})

Modified: code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake
===================================================================
--- code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake	2010-09-13 13:14:25 UTC (rev 7447)
+++ code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake	2010-09-13 13:14:52 UTC (rev 7448)
@@ -69,7 +69,6 @@
   IF(_list_index EQUAL -1) # Header file could already be included with GET_ALL_HEADER_FILES
     LIST(APPEND ${_sourcefile_var} ${_pch_header_file})
   ENDIF()
-  SOURCE_GROUP("PCH" FILES ${_pch_header_file})
 
   IF(MSVC)
 
@@ -80,7 +79,6 @@
     ENDIF()
     SET_SOURCE_FILES_PROPERTIES(_pch_source_file PROPERTIES GENERATED TRUE)
     LIST(APPEND ${_sourcefile_var} ${_pch_source_file})
-    SOURCE_GROUP("PCH" FILES ${_pch_source_file})
 
     SET(_pch_file "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_pch_header_filename}.pch")
     # Set compile flags for generated source file