diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-12 06:30:22 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-12 09:56:56 +0100 |
| commit | 7434d29f3ce0033194b53b44ed881f749e67da75 (patch) | |
| tree | f5ebcfda3d3a19b7d3bd648e74bd0e42def00a69 /external | |
| parent | 1a2801f6751f1baf52d5d989b9cccab97b3c921b (diff) | |
fix build
Diffstat (limited to 'external')
| -rw-r--r-- | external/CMakeLists.txt | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 0cffd3e7..569808b1 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -195,26 +195,20 @@ endif() set(fm-quiet-message 0) -function(message) +function(message m) + list(REMOVE_AT ARGV 0) if(fm-quiet-message) - list(GET ARGV 0 m) if(m STREQUAL FATAL_ERROR OR m STREQUAL SEND_ERROR OR m STREQUAL WARNING OR m STREQUAL AUTHOR_WARNING) - list(REMOVE_AT ARGV 0) - _message(${m} "${ARGV}") + _message("${m}" "${ARGV}") endif() else() - _message("${ARGV}") + _message("${m}" "${ARGV}") endif() endfunction() if(FLOORMAT_SUBMODULE-DEPENDENCIES) sets(PATH IMGUI_DIR "${CMAKE_CURRENT_SOURCE_DIR}/imgui") - if(MAGNUM_BUILD_PLUGINS_STATIC) - set(MAGNUM_WITH_SHADERTOOLS OFF) - set(MAGNUM_WITH_SHADERCONVERTER OFF) - endif() - function(fm_add_sdl2) unset(CMAKE_C_VISIBILITY_PRESET) unset(CMAKE_VISIBILITY_INLINES_HIDDEN) @@ -242,7 +236,12 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) endfunction() fm_run_hook(fm-userconfig-external-pre) - + if(MAGNUM_BUILD_PLUGINS_STATIC) + sets(BOOL + MAGNUM_WITH_SHADERTOOLS OFF + MAGNUM_WITH_SHADERCONVERTER OFF + ) + endif() fm_add_libs() endif() @@ -263,7 +262,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() + +fm_run_hook(fm-userconfig-external-post) set(fm-quiet-message 0) |