diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d21319..d794b09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,9 +88,13 @@ FetchContent_Declare( spdlog GIT_TAG v1.x_p8 ) FetchContent_MakeAvailable( spdlog ) +# if Scarab is being built as a submodule, the parent might need to know where to find spdlog +get_directory_property( hasParent PARENT_DIRECTORY ) +if( hasParent ) + set( spdlog_DIR ${spdlog_BINARY_DIR} PARENT_SCOPE ) +endif() list( APPEND PUBLIC_EXT_LIBS spdlog::spdlog ) - if( Scarab_BUILD_CODEC_JSON ) set( RAPIDJSON_FILE_BUFFER_SIZE 65536 CACHE STRING "Buffer size for reading and writing files using RapidJSON (in Bytes)" ) diff --git a/ScarabConfig.cmake.in b/ScarabConfig.cmake.in index eef33df..1bd1d3f 100644 --- a/ScarabConfig.cmake.in +++ b/ScarabConfig.cmake.in @@ -7,6 +7,7 @@ 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) if( @Scarab_BUILD_CODEC_JSON@ ) #Scarab_BUILD_CODEC_JSON find_dependency( RapidJSON REQUIRED ) if(NOT TARGET rapidjson) diff --git a/VERSION b/VERSION index 3bb58a4..d82b118 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3 13 3 +3 13 4 diff --git a/changelog.md b/changelog.md index 263d4ac..bdbcbc8 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,14 @@ Types of changes: Added, Changed, Deprecated, Removed, Fixed, Security ## [Unreleased] +## [3.13.4] - 2025-11-04 + +### Fixed + +- Find spdlog dependency in ScarabConfig.cmake.in +- Set spdlog_DIR in CMakeLists.txt if Scarab has a parent directory + + ## [3.13.3] - 2025-10-06 ### Changed