From 9790bcdcb1826b57c8fc0fec32f87e085a28002e Mon Sep 17 00:00:00 2001 From: Lynx3d Date: Wed, 16 Feb 2011 13:46:56 +0100 Subject: [PATCH] [11175] Fix precompiled header defines so GCC can actually use it --- cmake/FindPCHSupport.cmake | 7 +++++-- src/shared/revision_nr.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/FindPCHSupport.cmake b/cmake/FindPCHSupport.cmake index f00db2a5a..a75940eb4 100644 --- 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 index ee287b358..0204ebe6a 100644 --- 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__