Skip to content
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.

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

Forward-merge branch-24.10 into branch-24.12 #1684

Merged
merged 1 commit into from
Sep 23, 2024
Merged

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Sep 23, 2024

Forward-merge triggered by push to branch-24.10 that creates a PR to keep branch-24.12 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See forward-merger docs for more info.

* Update fmt (to 11.0.2) and spdlog (to 1.14.1).

* simplify get_spdlog

* copyright

* Apply suggestions from code review

Co-authored-by: Bradley Dice <[email protected]>

* Apply suggestions from code review

* test with changes from rapidsai/rapids-cmake@d7671a3

* Update cmake/thirdparty/get_spdlog.cmake

* move rapids-cmake overrides [skip ci]

* try reverting get_spdlog export changes [skip ci]

* more fiddling with export sets [skip ci]

* more exporting [skip ci]

* more export set fiddling [skip ci]

* more [skip ci]

* exports [skip ci]

* run a build

* restore tests

* branch references

* remove testing-only changes [skip ci]

---------

Co-authored-by: Bradley Dice <[email protected]>
@rapids-bot rapids-bot bot requested review from a team as code owners September 23, 2024 20:11
@rapids-bot rapids-bot bot requested a review from bdice September 23, 2024 20:11
@GPUtester GPUtester merged commit 1823321 into branch-24.12 Sep 23, 2024
Copy link
Author

rapids-bot bot commented Sep 23, 2024

SUCCESS - forward-merge complete.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants