-
Notifications
You must be signed in to change notification settings - Fork 37
Make CppInterOp work with new gtest target names. #643
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
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Starting from CMake v3.23, one can use GTest::gtest and similar in CMake. Since the root-project wants to move to these targets, Interop should work with both the new or the old target names in order not to start building its own gtest.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #643 +/- ##
=======================================
Coverage 78.77% 78.77%
=======================================
Files 9 9
Lines 3849 3849
=======================================
Hits 3032 3032
Misses 817 817 🚀 New features to boost your workflow:
|
vgvassilev
approved these changes
Jun 24, 2025
Contributor
vgvassilev
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lgtm! Thank you, @hageboeck!
aaronj0
added a commit
to aaronj0/root
that referenced
this pull request
Jun 28, 2025
Adds various upstreamed developments: compiler-research/CppInterOp#650 streamlines the logic in Cpp::Construct to be more generic. compiler-research/CppInterOp#643 by @hageboeck making CppInterOp work with new gtest target names Fixed wrapper name conflicts with ROOT that also uses `__cf`, allowing us to integrate JitCall incrementally and co-exist with CallFunc Fixes related to the cppyy forks Unrelated work on Emscripten and WebAssembly
aaronj0
added a commit
to root-project/root
that referenced
this pull request
Jun 28, 2025
Adds various upstreamed developments: compiler-research/CppInterOp#650 streamlines the logic in Cpp::Construct to be more generic. compiler-research/CppInterOp#643 by @hageboeck making CppInterOp work with new gtest target names Fixed wrapper name conflicts with ROOT that also uses `__cf`, allowing us to integrate JitCall incrementally and co-exist with CallFunc Fixes related to the cppyy forks Unrelated work on Emscripten and WebAssembly
GalinBistrev2
pushed a commit
to GalinBistrev2/root
that referenced
this pull request
Jun 30, 2025
Adds various upstreamed developments: compiler-research/CppInterOp#650 streamlines the logic in Cpp::Construct to be more generic. compiler-research/CppInterOp#643 by @hageboeck making CppInterOp work with new gtest target names Fixed wrapper name conflicts with ROOT that also uses `__cf`, allowing us to integrate JitCall incrementally and co-exist with CallFunc Fixes related to the cppyy forks Unrelated work on Emscripten and WebAssembly
martinfoell
pushed a commit
to martinfoell/root
that referenced
this pull request
Oct 9, 2025
Adds various upstreamed developments: compiler-research/CppInterOp#650 streamlines the logic in Cpp::Construct to be more generic. compiler-research/CppInterOp#643 by @hageboeck making CppInterOp work with new gtest target names Fixed wrapper name conflicts with ROOT that also uses `__cf`, allowing us to integrate JitCall incrementally and co-exist with CallFunc Fixes related to the cppyy forks Unrelated work on Emscripten and WebAssembly
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Starting from CMake v3.23, one can use GTest::gtest and similar in CMake. Since the root-project wants to move to these targets, it would be great if Interop works with either, to avoid it building its own gtest.
Note that in addition to adding the new target names, I removed the conditional inclusion of gmock, because it is needed to compile
EXPECT_THATandStartsWithinInterpreterTests.cpp. One could either rewrite the test without those (I found that too intrusive), or always link to gmock.I tested if gmock_main is needed (it doesn't seem to be), so I removed the dependency.