Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Buildsystem: Fixed windows pch build with ninja

Browse Source 
(cherry picked from commit a6e46c1c2ef491cd4cce39be47445e9da194e84e)
This commit is contained in:
Shauren authored and Aokromes committed 2017-12-14 09:49:56 +01:00
1 parent 47067814a1
commit f7fd109066
5 files changed
+13 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cmake/macros/FindPCHSupport.cmake
+9 -1
View File
@@ -128,9 +128,17 @@ FUNCTION(ADD_CXX_PCH_MSVC TARGET_NAME_LIST PCH_HEADER PCH_SOURCE)
GET_COMMON_PCH_PARAMS("${TARGET_NAME_LIST}" ${PCH_HEADER} "pch" "/I")
FOREACH(TARGET_NAME ${TARGET_NAME_LIST})
SET(PCH_COMPILE_FLAGS "/FI${PCH_HEADER_NAME} /Yu${PCH_HEADER_NAME}")
IF (NOT ${CMAKE_MAKE_PROGRAM} MATCHES "MSBuild")
SET(PCH_COMPILE_FLAGS "${PCH_COMPILE_FLAGS} /Fp${PCH_HEADER_OUT}")
SET(TARGET_SOURCES_LIST "")
GET_PROPERTY(TARGET_SOURCES_LIST TARGET ${TARGET_NAME} PROPERTY SOURCES)
LIST(REMOVE_ITEM TARGET_SOURCES_LIST ${PCH_SOURCE})
SET_SOURCE_FILES_PROPERTIES(${TARGET_SOURCES_LIST} PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${TARGET_NAME}.dir/${PCH_SOURCE}.obj")
ENDIF()
SET_TARGET_PROPERTIES(
${TARGET_NAME} PROPERTIES
COMPILE_FLAGS "/FI${PCH_HEADER_NAME} /Yu${PCH_HEADER_NAME}"
COMPILE_FLAGS "${PCH_COMPILE_FLAGS}"
)
ENDFOREACH()