Skip to content

Hotfix/3.14.3 #141

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

Open
nsoblath wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Hotfix/3.14.3 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20ce3a1
Boost min version in config file to match cmakelist requirement
nsoblath-pnnl Mar 10, 2026
709101b
spdlog tag updated to r2
nsoblath-pnnl Mar 10, 2026
5b37e7d
Changelog and version updated
nsoblath-pnnl Mar 10, 2026
e37ded3
Try adding include directories before, to see if this gets us past th…
nsoblath-pnnl Mar 10, 2026
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ScarabConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
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 14 2
3 14 3
10 changes: 9 additions & 1 deletion changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion cmake/PackageBuilderMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
"$<BUILD_INTERFACE:${SOURCE_TREE_INCLUDE_DIRS}>"
"$<INSTALL_INTERFACE:${TOP_PROJECT_INCLUDE_INSTALL_SUBDIR}${SM_INCLUDE_SUBDIR}>"
Expand Down