[11175] Fix precompiled header defines so GCC can actually use it

Archives · Feb 16, 2011 · 9790bcd · 9790bcd
1 parent 086d9e4
commit 9790bcd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cmake/FindPCHSupport.cmake b/cmake/FindPCHSupport.cmake
@@ -39,7 +39,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
 
-
+  STRING(TOUPPER ${CMAKE_BUILD_TYPE} _build_type)
   STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
   SET(${_out_compile_flags} ${${_flags_var_name}} )
 
@@ -60,10 +60,13 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
   ENDFOREACH(item)
 
   GET_DIRECTORY_PROPERTY(_directory_flags COMPILE_DEFINITIONS)
+  GET_DIRECTORY_PROPERTY(_directory_flags_type COMPILE_DEFINITIONS_${_build_type})
+  LIST(APPEND _directory_flags ${_directory_flags_type})
   # MESSAGE("_directory_flags ${_directory_flags}" )
 
   FOREACH(define ${_directory_flags})
-    LIST(APPEND ${_out_compile_flags} -D${define})
+    STRING(REPLACE "\"" "\\\"" escaped_define ${define})
+    LIST(APPEND ${_out_compile_flags} -D${escaped_define})
   ENDFOREACH(define)
   LIST(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS} )
 

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11174"
+ #define REVISION_NR "11175"
 #endif // __REVISION_NR_H__