diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-16 16:23:32 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-16 16:50:50 +0100 |
| commit | d9e5e232b60731d56b1b60f2fe113e2450f18208 (patch) | |
| tree | 0d56c75b9cfe4b886d249ad1de8d302c978e5a55 | |
| parent | 65b3b6603e8761a9629f7da19c352384bad2d4bf (diff) | |
ci: fix link failure due to undefined typeinfo
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 736d992d..e9bee471 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,12 +154,10 @@ if(NOT APPLE AND NOT WIN32) add_compile_options(-fno-plt) endif() -if(FALSE) if(MSVC) - add_compile_options(-GR-) + #add_compile_options(-GR-) else() - add_compile_options(-fno-rtti) -endif() + #add_compile_options(-fno-rtti) endif() fm_run_hook(fm-userconfig-src) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index b9ad5a2a..76e8753d 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -243,20 +243,20 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) fm_add_sdl2() #fm_add_luajit() if(MSVC) - add_compile_options(-GR-) + #add_compile_options(-GR-) else() - add_compile_options(-fno-rtti) + #add_compile_options(-fno-rtti) endif() add_subdirectory(fmt) add_subdirectory(json) add_subdirectory(corrade) if(MSVC) - target_compile_options(CorradeTestSuiteObjects PUBLIC -GR) - target_compile_options(CorradeTestSuite PUBLIC -GR) + #target_compile_options(CorradeTestSuiteObjects PUBLIC -GR) + #target_compile_options(CorradeTestSuite PUBLIC -GR) else() - target_compile_options(CorradeTestSuiteObjects PUBLIC -frtti) - target_compile_options(CorradeTestSuite PUBLIC -frtti) + #target_compile_options(CorradeTestSuiteObjects PUBLIC -frtti) + #target_compile_options(CorradeTestSuite PUBLIC -frtti) endif() add_subdirectory(magnum) add_subdirectory(magnum-plugins) |