diff --git a/ScarabConfig.cmake.in b/ScarabConfig.cmake.in index b30f1fc..f2b7881 100644 --- a/ScarabConfig.cmake.in +++ b/ScarabConfig.cmake.in @@ -7,7 +7,21 @@ get_filename_component( Scarab_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH ) # Find the dependencies include( CMakeFindDependencyMacro ) find_dependency( Boost 1.46 REQUIRED COMPONENTS @Scarab_BOOST_COMPONENTS@ ) + find_dependency( spdlog REQUIRED HINTS @spdlog_BINARY_DIR@ ) +# For some reason the INTERFACE_LINK_LIBRARIES property of the scarab library, which should include spdlog::spdlog, +# ends up including Scarab::spdlog instead. +# As a workaround, we create an alias library target from Scarab::splog to spdlog::spdlog +if( NOT TARGET Scarab::spdlog ) + # Check spdlog first to satisfy use when in a submodule (then spdlog::spdlog is itself an alias) + if( TARGET spdlog ) + add_library( Scarab::spdlog ALIAS spdlog ) + # Next check spdlog::spdlog; when used as a previously-installed dependency, spdlog::spdlog is an imported target + elseif( TARGET spdlog::spdlog ) + add_library( Scarab::spdlog ALIAS spdlog::spdlog ) + endif() +endif() + if( @Scarab_BUILD_CODEC_JSON@ ) #Scarab_BUILD_CODEC_JSON find_dependency( RapidJSON REQUIRED ) if(NOT TARGET rapidjson) diff --git a/VERSION b/VERSION index 081fb66..45087d5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3 14 1 +3 14 2 diff --git a/changelog.md b/changelog.md index 7db8c6e..6daa67d 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,14 @@ Types of changes: Added, Changed, Deprecated, Removed, Fixed, Security ## [Unreleased] + +## [3.14.2] - 2026-02-?? + +### Fixed + +- Fixed handling of dependencies in ScarabConfig.cmake.in + + ## [3.14.1] - 2026-01-23 ### Added diff --git a/library/logger/logger.hh b/library/logger/logger.hh index cd68d2d..6966dc3 100644 --- a/library/logger/logger.hh +++ b/library/logger/logger.hh @@ -26,7 +26,7 @@ #include "typename.hh" #ifndef SCARAB_LOGGER_DEFAULT_THRESHOLD -#define SCARAB_LOGGER_DEFAULT_THRESHOLD eInfo +#define SCARAB_LOGGER_DEFAULT_THRESHOLD #endif /**