From 594f43e74e2b7bac63ef0480b2354bd067e4578b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 22 Oct 2022 18:09:30 +0200 Subject: more build cruft --- external/CMakeLists.txt | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'external') diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 8f5632d1..ae40f982 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -36,16 +36,21 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) -DIMGUI_DISABLE_OBSOLETE_KEYIO ) sets(STRING + SDL_ASSERTIONS release SDL_INSTALL_CMAKEDIR "share/cmake/SDL2" NLOHMANN_JSON_CONFIG_INSTALL_DIR "share/cmake/nlohmann_json" - ) + ) + sets(BOOL + JSON_Diagnostics ON + JSON_Install ON + JSON_MultipleHeaders ON + JSON_SystemInclude ON + ) sets(BOOL CORRADE_BUILD_STATIC OFF CORRADE_BUILD_TESTS OFF CORRADE_BUILD_DEPRECATED OFF - CORRADE_MSVC_COMPATIBILITY OFF - CORRADE_UTILITY_USE_ANSI_COLORS ON CORRADE_WITH_TESTSUITE ON @@ -85,9 +90,6 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) MAGNUM_WITH_GLM OFF MAGNUM_WITH_IMGUI ON ) - sets(STRING - SDL_ASSERTIONS release - ) sets(BOOL SDL2_DISABLE_INSTALL OFF SDL2_DISABLE_SDL2MAIN ON @@ -133,13 +135,6 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) SDL_WASAPI OFF SDL_XINPUT OFF ) - - sets(BOOL - JSON_Diagnostics ON - JSON_Install ON - JSON_MultipleHeaders ON - JSON_SystemInclude ON - ) endif() fm_run_hook(fm-userconfig-external-pre) -- cgit v1.2.3