* Addendum to r66386.

svn path=/trunk/; revision=66387
This commit is contained in:
Amine Khaldi 2015-02-21 14:34:42 +00:00
parent 661bad6b05
commit 8c7c00cbc2
2 changed files with 2 additions and 6 deletions

View file

@ -142,7 +142,7 @@ else()
add_definitions(-D_WINKD_=1) add_definitions(-D_WINKD_=1)
endif() 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") set(PCH 1 CACHE BOOL "Whether to use precompiled headers")
else() else()
set(PCH 0 CACHE BOOL "Whether to use precompiled headers") set(PCH 0 CACHE BOOL "Whether to use precompiled headers")

View file

@ -366,7 +366,7 @@ endmacro()
set(PSEH_LIB "pseh") set(PSEH_LIB "pseh")
# Macros # Macros
if(PCH) if(PCH AND (NOT ENABLE_CCACHE))
add_compile_flags("-Winvalid-pch -Werror=invalid-pch") add_compile_flags("-Winvalid-pch -Werror=invalid-pch")
macro(add_pch _target _pch _sources) macro(add_pch _target _pch _sources)
# When including x.h GCC looks for x.h.gch first # When including x.h GCC looks for x.h.gch first
@ -388,10 +388,6 @@ if(PCH)
EXTERNAL_SOURCE TRUE EXTERNAL_SOURCE TRUE
OBJECT_LOCATION ${_gch}) 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 # Include the gch in the specified source files, skipping the pch file itself
list(REMOVE_ITEM ${_sources} ${_pch}) list(REMOVE_ITEM ${_sources} ${_pch})
foreach(_src ${${_sources}}) foreach(_src ${${_sources}})