From 41341dd87cf01584a0b53ce3fbe8b198b36fcc88 Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Mon, 3 Nov 2025 10:22:29 -0800 Subject: [PATCH 1/7] Add spdlog check to ScarabConfig.cmake.in --- ScarabConfig.cmake.in | 1 + 1 file changed, 1 insertion(+) diff --git a/ScarabConfig.cmake.in b/ScarabConfig.cmake.in index eef33dfd..c2bc775f 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) From c6c807d50d6fc8c38b2e64afc8bd46bab31f03df Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Mon, 3 Nov 2025 10:22:42 -0800 Subject: [PATCH 2/7] Update changelog and VERSION --- VERSION | 2 +- changelog.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3bb58a47..d82b1182 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3 13 3 +3 13 4 diff --git a/changelog.md b/changelog.md index 263d4ac1..b2eb6c05 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,13 @@ Types of changes: Added, Changed, Deprecated, Removed, Fixed, Security ## [Unreleased] +## [3.13.4] - 2025-11-03 + +### Fixed + +- Find spdlog dependency in ScarabConfig.cmake.in + + ## [3.13.3] - 2025-10-06 ### Changed From 201e54b96a5a311cccc6385b14e64db2c7c4abdb Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Tue, 4 Nov 2025 15:44:09 -0800 Subject: [PATCH 3/7] Add a hint to find the spdlog cmake config --- ScarabConfig.cmake.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ScarabConfig.cmake.in b/ScarabConfig.cmake.in index c2bc775f..6054e3b3 100644 --- a/ScarabConfig.cmake.in +++ b/ScarabConfig.cmake.in @@ -7,7 +7,9 @@ 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 ) +find_dependency( spdlog REQUIRED + HINTS @spdlog_BINARY_DIR@ +) if( @Scarab_BUILD_CODEC_JSON@ ) #Scarab_BUILD_CODEC_JSON find_dependency( RapidJSON REQUIRED ) if(NOT TARGET rapidjson) From 5ed91895f211281e71044ba775a9972aa900f530 Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Tue, 4 Nov 2025 15:44:20 -0800 Subject: [PATCH 4/7] Cleaning --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d213190..8a6c1fdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,6 @@ FetchContent_Declare( spdlog FetchContent_MakeAvailable( spdlog ) 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)" ) From c7d62b24ecf75870d64ab1add2d31e64c1491efd Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Tue, 4 Nov 2025 16:06:28 -0800 Subject: [PATCH 5/7] Remove use of the hint for spdlog in the cmake config file -- we don't want to bake the build directory in there --- ScarabConfig.cmake.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ScarabConfig.cmake.in b/ScarabConfig.cmake.in index 6054e3b3..1bd1d3f2 100644 --- a/ScarabConfig.cmake.in +++ b/ScarabConfig.cmake.in @@ -7,9 +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 - HINTS @spdlog_BINARY_DIR@ -) +find_dependency( spdlog REQUIRED) if( @Scarab_BUILD_CODEC_JSON@ ) #Scarab_BUILD_CODEC_JSON find_dependency( RapidJSON REQUIRED ) if(NOT TARGET rapidjson) From 29a8b87a085cd4b24036fa5dfce9ec51b96511e0 Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Tue, 4 Nov 2025 16:10:13 -0800 Subject: [PATCH 6/7] Set the spdlog dir in the Scarab CMakeLists file --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a6c1fdb..d794b09f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,6 +88,11 @@ 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 ) From 1e55562eba319a2589751742cf50f977446c2563 Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Tue, 4 Nov 2025 16:36:28 -0800 Subject: [PATCH 7/7] [no-ci] Updated the changelog --- changelog.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index b2eb6c05..bdbcbc85 100644 --- a/changelog.md +++ b/changelog.md @@ -9,11 +9,12 @@ Types of changes: Added, Changed, Deprecated, Removed, Fixed, Security ## [Unreleased] -## [3.13.4] - 2025-11-03 +## [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