Skip to content

Hotfix/3.13.4 #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nsoblath wants to merge 7 commits into from
Closed

Hotfix/3.13.4 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
41341dd
Add spdlog check to ScarabConfig.cmake.in
nsoblath Nov 3, 2025
c6c807d
Update changelog and VERSION
nsoblath Nov 3, 2025
201e54b
Add a hint to find the spdlog cmake config
nsoblath Nov 4, 2025
5ed9189
Cleaning
nsoblath Nov 4, 2025
c7d62b2
Remove use of the hint for spdlog in the cmake config file -- we don'…
nsoblath Nov 5, 2025
29a8b87
Set the spdlog dir in the Scarab CMakeLists file
nsoblath Nov 5, 2025
1e55562
[no-ci] Updated the changelog
nsoblath Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" )

Expand Down
1 change: 1 addition & 0 deletions ScarabConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3 13 3
3 13 4
8 changes: 8 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading