diff --git a/CMakeLists.txt b/CMakeLists.txt index 162ec1146..68f3c39fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -226,7 +226,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") find_package(Boost 1.84.0 CONFIG) find_package(CLI11 2.6.1 CONFIG) find_package(FFmpeg 5.1.2 MODULE) -find_package(fmt 10.2.0 CONFIG) +find_package(fmt 12.0.0 CONFIG) find_package(glslang 15 CONFIG) find_package(half 1.12.0 MODULE) find_package(magic_enum 0.9.7 CONFIG) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 7560b66f3..d195f0478 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -24,7 +24,10 @@ endif() # spdlog set(SPDLOG_NO_EXCEPTIONS ON) set(SPDLOG_DISABLE_GLOBAL_LOGGER ON) -add_subdirectory(spdlog) +if (TARGET fmt::fmt) + set(SPDLOG_FMT_EXTERNAL ON) +endif() +add_subdirectory(spdlog EXCLUDE_FROM_ALL SYSTEM) # fmtlib if (NOT TARGET fmt::fmt)