diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | doc/userconfig-you@Clang.cmake | 2 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fe7f57a2..ff626d1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,6 @@ endif() if(CMAKE_BUILD_TYPE STREQUAL "") set(CMAKE_BUILD_TYPE "RELEASE" CACHE STRING "" FORCE) endif() -string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE) set(FLOORMAT_PRECOMPILED-HEADERS ON CACHE BOOL "Use precompiled headers while building the floormat.") @@ -57,7 +56,8 @@ function(sets type) endwhile() endfunction() -sets(STRING CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}") +string(TOUPPER "${CMAKE_BUILD_TYPE}" __fm_uppercase_CMAKE_BUILD_TYPE) +sets(STRING CMAKE_BUILD_TYPE "${__fm_uppercase_CMAKE_BUILD_TYPE}") function(fm_run_hook str) if(COMMAND "${str}") diff --git a/doc/userconfig-you@Clang.cmake b/doc/userconfig-you@Clang.cmake index 543b36c7..3abee9ed 100644 --- a/doc/userconfig-you@Clang.cmake +++ b/doc/userconfig-you@Clang.cmake @@ -13,7 +13,7 @@ sets(STRING add_compile_options(-fdiagnostics-color=always) # for building submodule dependencies -function(fm-userconfig-external-pre) +function(fm-userconfig-external) add_compile_options( -Wno-ignored-attributes -Wno-unused-function diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index b5994db1..007368c9 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -228,6 +228,8 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) endif() endfunction() + fm_run_hook(fm-userconfig-external) + function(fm_add_libs) if(fm-external-configured) set(fm-quiet-message 1) @@ -245,7 +247,6 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) fm_add_luajit() endfunction() - fm_run_hook(fm-userconfig-external-pre) if(MAGNUM_BUILD_PLUGINS_STATIC) sets(BOOL MAGNUM_WITH_SHADERTOOLS OFF @@ -259,7 +260,7 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) if(MSVC) target_compile_options(CorradeTestSuiteObjects PRIVATE -EHsc) endif() - fm_run_hook(fm-userconfig-external) + fm_run_hook(fm-userconfig-post) endif() if(fm-external-configured) @@ -276,6 +277,5 @@ if(NOT FLOORMAT_SUBMODULE-DEPENDENCIES) find_package(fmt QUIET REQUIRED) endif() -fm_run_hook(fm-userconfig-external-post) set(fm-quiet-message 0) sets(INTERNAL fm-external-configured 1) |