diff options
| -rw-r--r-- | external/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | shaders/tile.cpp | 2 | ||||
| -rw-r--r-- | src/precomp.hpp | 1 |
3 files changed, 14 insertions, 14 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) diff --git a/shaders/tile.cpp b/shaders/tile.cpp index 16643fcf..de8adb78 100644 --- a/shaders/tile.cpp +++ b/shaders/tile.cpp @@ -2,8 +2,8 @@ #include "loader.hpp" #include "compat/assert.hpp" #include "local-coords.hpp" -#include <Corrade/Containers/StringStl.h> #include <Corrade/Containers/Iterable.h> +#include <Corrade/Containers/StringStl.h> #include <Magnum/Math/Vector4.h> #include <Magnum/GL/Context.h> #include <Magnum/GL/Shader.h> diff --git a/src/precomp.hpp b/src/precomp.hpp index 1e49f55e..9cdc85d6 100644 --- a/src/precomp.hpp +++ b/src/precomp.hpp @@ -25,6 +25,7 @@ #include <utility> #include <tuple> +#include <bitset> #include <array> #include <vector> #include <unordered_map> |