diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | draw/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | editor/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | main/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | serialize/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 10 |
8 files changed, 27 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 08a4fb7c..a1c0f28d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,8 +171,6 @@ endif() if(MSVC) add_compile_options(-GR-) -else() - add_compile_options(-fno-rtti) endif() fm_run_hook(fm-userconfig-src) diff --git a/draw/CMakeLists.txt b/draw/CMakeLists.txt index f2e11490..f12604ab 100644 --- a/draw/CMakeLists.txt +++ b/draw/CMakeLists.txt @@ -3,8 +3,8 @@ file(GLOB sources "*.cpp" CONFIGURE_ARGS) add_library(${self} OBJECT "${sources}") target_link_libraries(${self} PUBLIC Magnum::GL) -#if(NOT MSVC) -# target_precompile_headers(${self} REUSE_FROM floormat) -#else() -# target_precompile_headers(${self} PRIVATE ../src/precomp.hpp) -#endif() +if(NOT MSVC) + target_precompile_headers(${self} REUSE_FROM floormat) +else() + target_precompile_headers(${self} PRIVATE ../src/precomp.hpp) +endif() diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index 41173308..372d9cd8 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -30,8 +30,8 @@ target_link_libraries(${self} PRIVATE ${self}_o floormat-main floormat-serialize install(TARGETS ${self} RUNTIME DESTINATION bin) -#if(NOT MSVC) -# target_precompile_headers(${self}_o REUSE_FROM floormat) -#else() -# target_precompile_headers(${self}_o PRIVATE ../src/precomp.hpp) -#endif() +if(NOT MSVC) + target_precompile_headers(${self}_o REUSE_FROM floormat) +else() + target_precompile_headers(${self}_o PRIVATE ../src/precomp.hpp) +endif() diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index d4927955..27d69a88 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -258,8 +258,6 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) #fm_add_luajit() if(MSVC) add_compile_options(-GR-) - else() - add_compile_options(-fno-rtti) endif() add_subdirectory(fmt ${system}) add_subdirectory(json ${system}) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index c3174562..419043aa 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -11,8 +11,8 @@ target_link_libraries(${self} PUBLIC tsl::robin_map ) -#if(NOT MSVC) -# target_precompile_headers(${self} REUSE_FROM floormat) -#else() -# target_precompile_headers(${self} PRIVATE ../src/precomp.hpp) -#endif() +if(NOT MSVC) + target_precompile_headers(${self} REUSE_FROM floormat) +else() + target_precompile_headers(${self} PRIVATE ../src/precomp.hpp) +endif() diff --git a/serialize/CMakeLists.txt b/serialize/CMakeLists.txt index 2bafd960..cee8ac42 100644 --- a/serialize/CMakeLists.txt +++ b/serialize/CMakeLists.txt @@ -26,8 +26,8 @@ if(WIN32) target_link_libraries(${self} PUBLIC ntdll) endif() -#if(NOT MSVC) -# target_precompile_headers(${self} REUSE_FROM floormat) -#else() -# target_precompile_headers(${self} PRIVATE ../src/precomp.hpp) -#endif() +if(NOT MSVC) + target_precompile_headers(${self} REUSE_FROM floormat) +else() + target_precompile_headers(${self} PRIVATE ../src/precomp.hpp) +endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6222ccee..4f292847 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,9 +6,9 @@ target_link_libraries( Magnum::GL Magnum::Magnum Magnum::Shaders - Magnum::DebugTools + #Magnum::DebugTools fmt::fmt tsl::robin_map ) -#target_precompile_headers(${self} PRIVATE precomp.hpp) +target_precompile_headers(${self} PRIVATE precomp.hpp) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index db154673..e835c359 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -27,8 +27,8 @@ foreach(file ${saves}) configure_file("${file}" "${save-dir}" COPYONLY) endforeach() -#if(NOT MSVC) -# target_precompile_headers(${self}_o REUSE_FROM floormat) -#else() -# target_precompile_headers(${self}_o PRIVATE ../src/precomp.hpp) -#endif() +if(NOT MSVC) + target_precompile_headers(${self}_o REUSE_FROM floormat) +else() + target_precompile_headers(${self}_o PRIVATE ../src/precomp.hpp) +endif() |