From d056a387b0cdf977f4946903bcd311ceb07788a9 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 12 Nov 2022 01:20:44 +0100 Subject: external: run userconfig last --- external/CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 8ba31f31..b9147d04 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -190,8 +190,6 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) endif() endif() -fm_run_hook(fm-userconfig-external-pre) - set(fm-quiet-message 0) function(message) @@ -241,6 +239,8 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) fm_add_luajit() endfunction() + fm_run_hook(fm-userconfig-external-pre) + fm_add_libs() endif() @@ -248,10 +248,9 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) if(MSVC) target_compile_options(CorradeTestSuiteObjects PRIVATE -EHsc) endif() + fm_run_hook(fm-userconfig-external) endif() -fm_run_hook(fm-userconfig-external) - set(fm-quiet-message 1) find_package(SDL2 QUIET REQUIRED) find_package(Corrade QUIET REQUIRED) @@ -262,7 +261,7 @@ find_package(MagnumIntegration QUIET REQUIRED ImGui) if(NOT FLOORMAT_SUBMODULE-DEPENDENCIES) find_package(fmt QUIET REQUIRED) +else() + fm_run_hook(fm-userconfig-external-post) endif() set(fm-quiet-message 0) - -fm_run_hook(fm-userconfig-external-post) -- cgit v1.2.3