Add option to disable precompiled headers

To be able to use ccache. Also fix compilation errors appeared due to absence of precompiled headers.
2025-01-29 21:45:33 +00:00 · 2024-03-08 01:22:42 +01:00 · 2024-03-08 01:22:42 +01:00 · 5859fd464c
commit 5859fd464c
parent 65d51665e5
26 changed files with 29 additions and 23 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -44,6 +44,7 @@ option(BUILD_BENCHMARKS         "Build benchmarks with Google Benchmark" OFF)
 option(BUILD_NAVMESHTOOL        "Build navmesh tool" ON)
 option(BUILD_BULLETOBJECTTOOL   "Build Bullet object tool" ON)
 option(BUILD_OPENCS_TESTS       "Build OpenMW Construction Set tests" OFF)
+option(PRECOMPILE_HEADERS_WITH_MSVC "Precompile most common used headers with MSVC (alternative to ccache)" ON)

 set(OpenGL_GL_PREFERENCE LEGACY)  # Use LEGACY as we use GL2; GLNVD is for GL3 and up.

--- a/apps/benchmarks/detournavigator/CMakeLists.txt
+++ b/apps/benchmarks/detournavigator/CMakeLists.txt
@ -5,7 +5,7 @@ if (UNIX AND NOT APPLE)
    target_link_libraries(openmw_detournavigator_navmeshtilescache_benchmark ${CMAKE_THREAD_LIBS_INIT})
 endif()

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(openmw_detournavigator_navmeshtilescache_benchmark PRIVATE <algorithm>)
 endif()

--- a/apps/benchmarks/esm/CMakeLists.txt
+++ b/apps/benchmarks/esm/CMakeLists.txt
@ -5,7 +5,7 @@ if (UNIX AND NOT APPLE)
    target_link_libraries(openmw_esm_refid_benchmark ${CMAKE_THREAD_LIBS_INIT})
 endif()

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(openmw_esm_refid_benchmark PRIVATE <algorithm>)
 endif()

--- a/apps/benchmarks/settings/CMakeLists.txt
+++ b/apps/benchmarks/settings/CMakeLists.txt
@ -8,7 +8,7 @@ if (UNIX AND NOT APPLE)
    target_link_libraries(openmw_settings_access_benchmark ${CMAKE_THREAD_LIBS_INIT})
 endif()

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(openmw_settings_access_benchmark PRIVATE <algorithm>)
 endif()

--- a/apps/bsatool/CMakeLists.txt
+++ b/apps/bsatool/CMakeLists.txt
@ -18,7 +18,7 @@ if (BUILD_WITH_CODE_COVERAGE)
    target_link_libraries(bsatool gcov)
 endif()

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(bsatool PRIVATE
        <filesystem>
        <fstream>
--- a/apps/bulletobjecttool/CMakeLists.txt
+++ b/apps/bulletobjecttool/CMakeLists.txt
@ -19,7 +19,7 @@ if (WIN32)
    install(TARGETS openmw-bulletobjecttool RUNTIME DESTINATION ".")
 endif()

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(openmw-bulletobjecttool PRIVATE
        <string>
        <vector>
--- a/apps/esmtool/CMakeLists.txt
+++ b/apps/esmtool/CMakeLists.txt
@ -25,7 +25,7 @@ if (BUILD_WITH_CODE_COVERAGE)
    target_link_libraries(esmtool gcov)
 endif()

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(esmtool PRIVATE
        <fstream>
        <string>
--- a/apps/essimporter/CMakeLists.txt
+++ b/apps/essimporter/CMakeLists.txt
@ -47,7 +47,7 @@ if (WIN32)
    INSTALL(TARGETS openmw-essimporter RUNTIME DESTINATION ".")
 endif(WIN32)

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(openmw-essimporter PRIVATE
        <algorithm>
        <filesystem>
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@ -94,7 +94,7 @@ if(USE_QT)
    set_property(TARGET openmw-launcher PROPERTY AUTOMOC ON)
 endif(USE_QT)

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(openmw-launcher PRIVATE
        <boost/program_options/options_description.hpp>

--- a/apps/mwiniimporter/CMakeLists.txt
+++ b/apps/mwiniimporter/CMakeLists.txt
@ -33,7 +33,7 @@ if (BUILD_WITH_CODE_COVERAGE)
    target_link_libraries(openmw-iniimporter gcov)
 endif()

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(openmw-iniimporter PRIVATE
        <string>
        <vector>
--- a/apps/navmeshtool/CMakeLists.txt
+++ b/apps/navmeshtool/CMakeLists.txt
@ -21,7 +21,7 @@ if (WIN32)
    install(TARGETS openmw-navmeshtool RUNTIME DESTINATION ".")
 endif()

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(openmw-navmeshtool PRIVATE
        <algorithm>
        <memory>
--- a/apps/niftest/CMakeLists.txt
+++ b/apps/niftest/CMakeLists.txt
@ -17,6 +17,6 @@ if (BUILD_WITH_CODE_COVERAGE)
    target_link_libraries(niftest gcov)
 endif()

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(niftest PRIVATE <filesystem>)
 endif()
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@ -292,7 +292,7 @@ if (BUILD_WITH_CODE_COVERAGE)
    target_link_libraries(openmw-cs-lib gcov)
 endif()

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(openmw-cs-lib PRIVATE
        <boost/program_options/options_description.hpp>

--- a/apps/opencs_tests/CMakeLists.txt
+++ b/apps/opencs_tests/CMakeLists.txt
@ -26,7 +26,7 @@ if (BUILD_WITH_CODE_COVERAGE)
    target_link_libraries(openmw-cs-tests PRIVATE gcov)
 endif()

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(openmw-cs-tests PRIVATE
        <gtest/gtest.h>
    )
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@ -161,7 +161,7 @@ target_link_libraries(openmw
    components
 )

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(openmw PRIVATE
        <boost/program_options/options_description.hpp>

--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@ -126,7 +126,7 @@ target_compile_definitions(openmw_test_suite
    PRIVATE OPENMW_DATA_DIR=u8"${CMAKE_CURRENT_BINARY_DIR}/data"
            OPENMW_PROJECT_SOURCE_DIR=u8"${PROJECT_SOURCE_DIR}")

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(openmw_test_suite PRIVATE
        <boost/program_options/options_description.hpp>

--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@ -691,7 +691,7 @@ if(USE_QT)
    set_property(TARGET components_qt PROPERTY AUTOMOC ON)
 endif(USE_QT)

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(components PUBLIC
        <sol/sol.hpp>

--- a/components/detournavigator/commulativeaabb.hpp
+++ b/components/detournavigator/commulativeaabb.hpp
@ -3,7 +3,7 @@

 #include <BulletCollision/Gimpact/btBoxCollision.h>

-#include <cstdint>
+#include <cstddef>

 namespace DetourNavigator
 {
--- a/components/esm/esm3exteriorcellrefid.hpp
+++ b/components/esm/esm3exteriorcellrefid.hpp
@ -3,7 +3,7 @@

 #include <functional>
 #include <iosfwd>
-
+#include <string>
 #include <utility>

 #include <components/misc/hash.hpp>
--- a/components/esm/format.cpp
+++ b/components/esm/format.cpp
@ -3,6 +3,7 @@
 #include <cstring>
 #include <istream>
 #include <stdexcept>
+#include <string>

 namespace ESM
 {
--- a/components/esm/generatedrefid.hpp
+++ b/components/esm/generatedrefid.hpp
@ -4,6 +4,7 @@
 #include <cstdint>
 #include <functional>
 #include <iosfwd>
+#include <string>

 namespace ESM
 {
--- a/components/platform/platform.cpp
+++ b/components/platform/platform.cpp
@ -1,12 +1,15 @@
 #include "platform.hpp"

+#ifdef WIN32
+#include <stdio.h>
+#endif
+
 namespace Platform
 {

    static void increaseFileHandleLimit()
    {
 #ifdef WIN32
-#include <stdio.h>
        // Increase limit for open files at the stream I/O level, see
        // https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/setmaxstdio?view=msvc-170#remarks
        _setmaxstdio(8192);
--- a/extern/Base64/CMakeLists.txt
+++ b/extern/Base64/CMakeLists.txt
@ -1,6 +1,6 @@
 add_library(Base64 INTERFACE)
 target_include_directories(Base64 INTERFACE .)

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(Base64 INTERFACE <string>)
 endif()
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@ -234,7 +234,7 @@ if (NOT OPENMW_USE_SYSTEM_YAML_CPP)
    )
    FetchContent_MakeAvailableExcludeFromAll(yaml-cpp)

-    if (MSVC)
+    if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
        target_precompile_headers(yaml-cpp PRIVATE <algorithm>)
    endif()
 endif()
--- a/extern/oics/CMakeLists.txt
+++ b/extern/oics/CMakeLists.txt
@ -22,6 +22,6 @@ endif()

 target_link_libraries(oics SDL2::SDL2)

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(oics PUBLIC <algorithm> <string>)
 endif()
--- a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
+++ b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
@ -18,7 +18,7 @@ target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} SDL2::SDL2)

 link_directories(${CMAKE_CURRENT_BINARY_DIR})

-if (MSVC)
+if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
    target_precompile_headers(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} PUBLIC
        <memory>
        <string>