cmake: use 'target_precompile_headers'

Fix also ninja build issue
DFIR-ORC · Nov 9, 2020 · d31e841 · d31e841
1 parent 4576245
commit d31e841
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 4 deletions.
diff --git a/cmake/Orc.cmake b/cmake/Orc.cmake
@@ -38,7 +38,6 @@ add_compile_options(
     /Qpar     # Enable Parallel Code Generation
    # /Qspectre-  # No need of mitigation as MS disable theirs when as administrator
     /sdl      # Enable additional security checks
-    /Yustdafx.h
   # /Zi       # Program database for edit and continue (debug only)
     /bigobj
 )
@@ -71,7 +70,4 @@ foreach(OPTION IN ITEMS ${COMPILE_OPTIONS_RELEASE})
     add_compile_options($<$<CONFIG:RELWITHDEBINFO>:${OPTION}>)
 endforeach()
 
-# Always add precompiled header creation flag
-set_source_files_properties(stdafx.cpp PROPERTIES COMPILE_FLAGS "/Ycstdafx.h")
-
 endmacro()
diff --git a/src/FastFind/CMakeLists.txt b/src/FastFind/CMakeLists.txt
@@ -55,6 +55,8 @@ set_target_properties(FastFind
         LINK_FLAGS "/DEBUG /MANIFESTUAC:\"level='requireAdministrator'\""
 )
 
+target_precompile_headers(FastFind PRIVATE stdafx.h)
+
 if("${CMAKE_GENERATOR_TOOLSET}" STREQUAL "v141_xp"
     AND "${TARGET_ARCH}" STREQUAL "x86")
 

diff --git a/src/Orc/CMakeLists.txt b/src/Orc/CMakeLists.txt
@@ -52,6 +52,8 @@ target_link_libraries(Orc
         VisualStudio::atls
 )
 
+target_precompile_headers(Orc PRIVATE stdafx.h)
+
 if("${CMAKE_GENERATOR_TOOLSET}" STREQUAL "v141_xp"
     AND "${TARGET_ARCH}" STREQUAL "x86")
 

diff --git a/src/OrcApacheOrc/CMakeLists.txt b/src/OrcApacheOrc/CMakeLists.txt
@@ -33,6 +33,8 @@ set_target_properties(OrcApacheOrc
         FOLDER "${ORC_ROOT_VIRTUAL_FOLDER}OrcApacheOrc"
 )
 
+target_precompile_headers(OrcApacheOrc PRIVATE stdafx.h)
+
 foreach(CONFIG Debug MinSizeRel Release RelWithDebInfo)
     install(TARGETS OrcApacheOrc
         CONFIGURATIONS ${CONFIG}

diff --git a/src/OrcApacheOrcLib/CMakeLists.txt b/src/OrcApacheOrcLib/CMakeLists.txt
@@ -33,6 +33,8 @@ add_library(OrcApacheOrcLib
         ${SRC_COMMON}
 )
 
+target_precompile_headers(OrcApacheOrcLib PRIVATE stdafx.h)
+
 target_include_directories(OrcApacheOrcLib
     INTERFACE
         ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/src/OrcCommand/CMakeLists.txt b/src/OrcCommand/CMakeLists.txt
@@ -312,4 +312,6 @@ target_include_directories(OrcCommand
 
 target_link_libraries(OrcCommand PUBLIC OrcLib)
 
+target_precompile_headers(OrcCommand PRIVATE stdafx.h)
+
 set_target_properties(OrcCommand PROPERTIES FOLDER "${ORC_ROOT_VIRTUAL_FOLDER}")
diff --git a/src/OrcLib/CMakeLists.txt b/src/OrcLib/CMakeLists.txt
@@ -796,5 +796,6 @@ endif()
     target_link_libraries(OrcLib PUBLIC chakracore::chakracore-header-only)
  endif()
 
+target_precompile_headers(OrcLib PRIVATE stdafx.h)
 
 set_target_properties(OrcLib PROPERTIES FOLDER "${ORC_ROOT_VIRTUAL_FOLDER}")
diff --git a/src/OrcParquet/CMakeLists.txt b/src/OrcParquet/CMakeLists.txt
@@ -34,6 +34,8 @@ set_target_properties(OrcParquet
         FOLDER "${ORC_ROOT_VIRTUAL_FOLDER}OrcParquet"
 )
 
+target_precompile_headers(OrcParquet PRIVATE stdafx.h)
+
 foreach(CONFIG Debug MinSizeRel Release RelWithDebInfo)
     install(TARGETS OrcParquet
         CONFIGURATIONS ${CONFIG}

diff --git a/src/OrcParquetLib/CMakeLists.txt b/src/OrcParquetLib/CMakeLists.txt
@@ -32,6 +32,8 @@ add_library(OrcParquetLib
         ${SRC_COMMON}
 )
 
+target_precompile_headers(OrcParquetLib PRIVATE stdafx.h)
+
 target_compile_definitions(OrcParquetLib PUBLIC ARROW_STATIC PARQUET_STATIC)
 
 target_include_directories(OrcParquetLib PRIVATE ${Boost_INCLUDE_DIRS})

diff --git a/src/OrcSql/CMakeLists.txt b/src/OrcSql/CMakeLists.txt
@@ -34,6 +34,8 @@ add_library(OrcSql
         ${SRC_UTILITIES}
 )
 
+target_precompile_headers(OrcSql PRIVATE stdafx.h)
+
 target_include_directories(OrcSql
     PRIVATE
         ${Boost_INCLUDE_DIRS}

diff --git a/tests/OrcApacheOrcTest/CMakeLists.txt b/tests/OrcApacheOrcTest/CMakeLists.txt
@@ -37,6 +37,8 @@ set_target_properties(OrcApacheOrcTest
         FOLDER "${ORC_ROOT_VIRTUAL_FOLDER}OrcApacheOrc"
 )
 
+target_precompile_headers(OrcApacheOrcTest PRIVATE stdafx.h)
+
 if("${TARGET_ARCH}" STREQUAL "x64")
     set(APACHEORC_VAR_NAME "APACHEORC_X64DLL")
 elseif("${TARGET_ARCH}" STREQUAL "x86")

diff --git a/tests/OrcLibTest/CMakeLists.txt b/tests/OrcLibTest/CMakeLists.txt
@@ -190,6 +190,8 @@ target_link_libraries(OrcLibTest
         OrcLib
 )
 
+target_precompile_headers(OrcLibTest PRIVATE stdafx.h)
+
 set_target_properties(OrcLibTest PROPERTIES FOLDER "${ORC_ROOT_VIRTUAL_FOLDER}")
 
 if(ORC_BUILD_CHAKRACORE)

diff --git a/tests/OrcSqlTest/CMakeLists.txt b/tests/OrcSqlTest/CMakeLists.txt
@@ -30,6 +30,8 @@ add_library(OrcSqlTest
         ${SRC_COMMON}
 )
 
+target_precompile_headers(OrcSqlTest PRIVATE stdafx.h)
+
 target_link_libraries(OrcSqlTest PRIVATE OrcSql)
 
 set_target_properties(OrcSqlTest