Merge pull request #2580 from diorcety/ninja

Use OBJECT_DEPENDS and OBJECT_OUTPUTS for precompiled.hpp
This commit is contained in:
Luca Boccassi 2017-05-18 11:33:05 +01:00 committed by GitHub
commit bc8ad8860b

View File

@ -703,15 +703,19 @@ endif ()
if (MSVC) if (MSVC)
# default for all sources is to use precompiled headers # default for all sources is to use precompiled headers
foreach(source ${sources}) foreach(source ${sources})
set_source_files_properties(${source} if (NOT ${source} STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}/src/precompiled.cpp")
PROPERTIES set_source_files_properties(${source}
COMPILE_FLAGS "/Yuprecompiled.hpp" PROPERTIES
) COMPILE_FLAGS "/Yuprecompiled.hpp"
OBJECT_DEPENDS precompiled.hpp
)
endif()
endforeach() endforeach()
# create precompiled header # create precompiled header
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/precompiled.cpp set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/precompiled.cpp
PROPERTIES PROPERTIES
COMPILE_FLAGS "/Ycprecompiled.hpp" COMPILE_FLAGS "/Ycprecompiled.hpp"
OBJECT_OUTPUTS precompiled.hpp
) )
# C and C++ can not use the same precompiled header # C and C++ can not use the same precompiled header
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/tweetnacl.c set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/tweetnacl.c