diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2022-09-29 11:19:51 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 11:19:51 +1000 |
| commit | 23279c62d2655db75ee2ddb3fcfe77cbcebeba3b (patch) | |
| tree | 9e49ef591aa7e013ecc8855107b3128073512950 /cmake/modules/FindSpdlog.cmake | |
| parent | ad09b861ce20d3a152bd5218c86e6d6404eebdda (diff) | |
| parent | 6b1bded881998b20ff204c1810951c476cdb2aea (diff) | |
Merge pull request #21613 from fuzzard/cmake_winspdlogfmt
[Cmake] enable build of spdlog/fmt for all platforms
Diffstat (limited to 'cmake/modules/FindSpdlog.cmake')
| -rw-r--r-- | cmake/modules/FindSpdlog.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cmake/modules/FindSpdlog.cmake b/cmake/modules/FindSpdlog.cmake index fca6437388..23c8617db0 100644 --- a/cmake/modules/FindSpdlog.cmake +++ b/cmake/modules/FindSpdlog.cmake @@ -14,21 +14,22 @@ # Spdlog::Spdlog - The Spdlog library if(ENABLE_INTERNAL_SPDLOG) + include(cmake/scripts/common/ModuleHelpers.cmake) - # Check for dependencies - find_package(Fmt MODULE QUIET) + # Check for dependencies - Must be done before SETUP_BUILD_VARS + get_libversion_data("fmt" "target") + find_package(Fmt ${LIB_FMT_VER} MODULE REQUIRED) - include(cmake/scripts/common/ModuleHelpers.cmake) + # Check if we want to force a build due to a dependency rebuild + get_property(LIB_FORCE_REBUILD TARGET fmt::fmt PROPERTY LIB_BUILD) set(MODULE_LC spdlog) - SETUP_BUILD_VARS() # Check for existing SPDLOG. If version >= SPDLOG-VERSION file version, dont build find_package(SPDLOG CONFIG QUIET) - if(SPDLOG_VERSION VERSION_LESS ${${MODULE}_VER}) - + if(SPDLOG_VERSION VERSION_LESS ${${MODULE}_VER} OR LIB_FORCE_REBUILD) if(APPLE) set(EXTRA_ARGS "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}") endif() |