Use CMake built-in PCH when supported

k0zmo · Sep 5, 2020 · e82e072 · e82e072
1 parent beaef27
commit e82e072
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 199 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,6 @@ if(kl_master_project)
     include(Sanitizers)
 endif()
 include(SourceGroup)
-include(PrecompileHeaders)
 
 find_package(Boost 1.61.0 REQUIRED COMPONENTS)
 

diff --git a/cmake/PrecompileHeaders.cmake b/cmake/PrecompileHeaders.cmake
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -62,14 +62,16 @@ if(KL_ENABLE_YAML)
             )
         endif()
         set_target_properties(yaml-cpp PROPERTIES FOLDER external)
-        kl_precompile_headers(yaml-cpp HEADERS
-            string
-            ostream
-            istream
-            ios
-            map
-            vector
-        )
+        if(COMMAND target_precompile_headers)
+            target_precompile_headers(yaml-cpp PRIVATE
+                <string>
+                <ostream>
+                <istream>
+                <ios>
+                <map>
+                <vector>
+            )
+        endif()
     endif()
 endif()
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -77,15 +77,14 @@ elseif(KL_USE_OPENCPPCOVERAGE)
     )
 endif()
 
-kl_precompile_headers(kl-tests
-    HEADERS
-        boost/optional.hpp
-        boost/variant.hpp
-        istream
-        ostream
-        ios
-        catch2/catch.hpp
-    EXCLUDE
-        main_test.cpp
-    SOURCE_GROUP pch
-)
+if(COMMAND target_precompile_headers)
+    target_precompile_headers(kl-tests PRIVATE
+        <boost/optional.hpp>
+        <boost/variant.hpp>
+        <istream>
+        <ostream>
+        <ios>
+        <catch2/catch.hpp>
+    )
+    set_source_files_properties(main_test.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
+endif()