Author: akhaldi Date: Sat Feb 21 14:34:42 2015 New Revision: 66387
URL: http://svn.reactos.org/svn/reactos?rev=66387&view=rev Log: * Addendum to r66386.
Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/gcc.cmake
Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=66387&am... ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Feb 21 14:34:42 2015 @@ -142,7 +142,7 @@ add_definitions(-D_WINKD_=1) endif()
- if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS" AND NOT ENABLE_CCACHE) + if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") set(PCH 1 CACHE BOOL "Whether to use precompiled headers") else() set(PCH 0 CACHE BOOL "Whether to use precompiled headers")
Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=66387&a... ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Feb 21 14:34:42 2015 @@ -366,7 +366,7 @@ set(PSEH_LIB "pseh")
# Macros -if(PCH) +if(PCH AND (NOT ENABLE_CCACHE)) add_compile_flags("-Winvalid-pch -Werror=invalid-pch") macro(add_pch _target _pch _sources) # When including x.h GCC looks for x.h.gch first @@ -387,10 +387,6 @@ LANGUAGE ${_pch_language} EXTERNAL_SOURCE TRUE OBJECT_LOCATION ${_gch}) - - if(ENABLE_CCACHE) - set(_ccache_flag "-fpch-preprocess") - endif()
# Include the gch in the specified source files, skipping the pch file itself list(REMOVE_ITEM ${_sources} ${_pch})