Skip to content

Bump spdlog to 1.11, add fmt as dependency for spdlog #368

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

Merged
rapids-bot merged 8 commits into from
Feb 13, 2023
Merged

Bump spdlog to 1.11, add fmt as dependency for spdlog #368

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
01044f3
Bump spdlog to 1.11, add fmt as depedency
kkraus14 Feb 9, 2023
c292765
make pre-commit happy
kkraus14 Feb 9, 2023
14d63e4
add option for fmt handling, use spdlog_ROOT
kkraus14 Feb 9, 2023
603a2bb
typo
kkraus14 Feb 9, 2023
16036f1
fix string comparisons, fix exports, add ability to use std::format
kkraus14 Feb 9, 2023
8ac817d
more properly handle exports, add version added to doc
kkraus14 Feb 10, 2023
6a5694a
Add `STD_FORMAT` option to the error message
kkraus14 Feb 10, 2023
da031b7
Merge branch 'branch-23.04' into spdlog_1.11_fmt
bdice Feb 10, 2023
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 rapids-cmake/cpm/spdlog.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ function(rapids_cpm_spdlog)
include("${rapids-cmake-dir}/cpm/detail/generate_patch_command.cmake")
rapids_cpm_generate_patch_command(spdlog ${version} patch_command)

# Add fmt in the case where we need to fetch spdlog from source
include("${rapids-cmake-dir}/cpm/fmt.cmake")
rapids_cpm_fmt(BUILD_EXPORT_SET spdlog INSTALL_EXPORT_SET spdlog)

include("${rapids-cmake-dir}/cpm/find.cmake")
rapids_cpm_find(spdlog ${version} ${ARGN}
GLOBAL_TARGETS spdlog::spdlog spdlog::spdlog_header_only
Expand All @@ -71,7 +75,7 @@ function(rapids_cpm_spdlog)
GIT_SHALLOW ${shallow}
PATCH_COMMAND ${patch_command}
EXCLUDE_FROM_ALL ${exclude}
OPTIONS "SPDLOG_INSTALL ${to_install}")
OPTIONS "SPDLOG_INSTALL ${to_install}" "SPDLOG_FMT_EXTERNAL_HO ON")

include("${rapids-cmake-dir}/cpm/detail/display_patch_status.cmake")
rapids_cpm_display_patch_status(spdlog)
Expand Down
2 changes: 1 addition & 1 deletion rapids-cmake/cpm/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"git_tag" : "branch-${version}"
},
"spdlog" : {
"version" : "1.8.5",
"version" : "1.11.0",
"git_url" : "https://github.com/gabime/spdlog.git",
"git_tag" : "v${version}"
},
Expand Down