From 20ce3a1a8637e9c00935a5a9cc381e0530195514 Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Tue, 10 Mar 2026 04:31:43 -0700 Subject: [PATCH 1/4] Boost min version in config file to match cmakelist requirement --- ScarabConfig.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ScarabConfig.cmake.in b/ScarabConfig.cmake.in index f2b7881..c3cee2c 100644 --- a/ScarabConfig.cmake.in +++ b/ScarabConfig.cmake.in @@ -6,7 +6,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( Boost 1.70 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, From 709101b7ca3b1debe820acdfee8526406b88c52a Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Tue, 10 Mar 2026 04:31:58 -0700 Subject: [PATCH 2/4] spdlog tag updated to r2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6a8eca..13fe3f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,7 @@ set( SPDLOG_BUILD_SHARED TRUE ) set( SPDLOG_INSTALL TRUE ) FetchContent_Declare( spdlog GIT_REPOSITORY https://github.com/project8/spdlog.git - GIT_TAG v1.x_p8_r1 + GIT_TAG v1.x_p8_r2 ) FetchContent_MakeAvailable( spdlog ) # if Scarab is being built as a submodule, the parent might need to know where to find spdlog From 5b37e7d82013aa891c10e0b8504a56d9e5bd8d4a Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Tue, 10 Mar 2026 04:34:10 -0700 Subject: [PATCH 3/4] Changelog and version updated --- VERSION | 2 +- changelog.md | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 45087d5..43a6c02 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3 14 2 +3 14 3 diff --git a/changelog.md b/changelog.md index 6daa67d..6798fa4 100644 --- a/changelog.md +++ b/changelog.md @@ -10,7 +10,15 @@ Types of changes: Added, Changed, Deprecated, Removed, Fixed, Security ## [Unreleased] -## [3.14.2] - 2026-02-?? +## [3.14.3] - 2026-03-10 + +### Fixed + +- Boost min required version in CMake config file set to v1.70.0 +- Updated spdlog tag to v1.x_p8_r2 + + +## [3.14.2] - 2026-02-27 ### Fixed From e37ded397b6db566c189ee1f5c84cdbb6d308241 Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Tue, 10 Mar 2026 11:55:37 -0700 Subject: [PATCH 4/4] Try adding include directories before, to see if this gets us past the spdlog confusion --- cmake/PackageBuilderMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/PackageBuilderMacros.cmake b/cmake/PackageBuilderMacros.cmake index 199ed8e..f6c293d 100644 --- a/cmake/PackageBuilderMacros.cmake +++ b/cmake/PackageBuilderMacros.cmake @@ -222,7 +222,7 @@ function( pbuilder_add_library ) # this will set the INTERFACE_INCLUDE_DIRECTORIES property using the INTERFACE option # it's assumed that the include_directories() command was used to set the INCLUDE_DIRECTORIES property for the private side. - target_include_directories( ${FULL_LIB_TARGET} + target_include_directories( ${FULL_LIB_TARGET} BEFORE INTERFACE "$" "$"