-
Notifications
You must be signed in to change notification settings - Fork 427
Don't install vendored backward files (take II) #3088
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
Merged
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3569814
Back to skip the backwards-cpp vendor files when installing
j-rivero cf02e9d
Include a file with Gazebo changes
j-rivero 50b3514
Merge branch 'gz-sim10' into jrivero/backwards_remove
eb7b252
Remove install block in vendor
j-rivero f6e2640
Changelog
caguero ce8d8b6
Merge from gz-sim10
caguero 62d8dfc
codespell: skip *.patch files
scpeters bd43185
fix path
scpeters 6c59526
remove whitespace from patch
scpeters File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| Summary: avoid installing backwards file in the system unless being | ||
| used as a top level | ||
|
|
||
| Description: do not install backwards files in the Gazebo usage of | ||
| the vendor package. See https://github.com/gazebosim/gz-sim/pull/2838. | ||
| Upstream PR related: https://github.com/bombela/backward-cpp/pull/338 | ||
|
|
||
| On updates, be sure of preserving this patch. | ||
|
|
||
| diff --git a/vendor/backward-cpp/CMakeLists.txt b/vendor/backward-cpp/CMakeLists.txt | ||
| index e625f8ac9..3b18476d5 100644 | ||
| --- a/vendor/backward-cpp/CMakeLists.txt | ||
| +++ b/vendor/backward-cpp/CMakeLists.txt | ||
| @@ -157,16 +157,16 @@ if(BACKWARD_TESTS) | ||
| endforeach() | ||
| endif() | ||
|
|
||
| -install( | ||
| - FILES "backward.hpp" | ||
| - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} | ||
| -) | ||
| -install( | ||
| - FILES "BackwardConfig.cmake" | ||
| - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" | ||
| -) | ||
| # check if Backward is being used as a top-level project or included as a subproject | ||
| if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) | ||
| + install( | ||
| + FILES "backward.hpp" | ||
| + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} | ||
| + ) | ||
| + install( | ||
| + FILES "BackwardConfig.cmake" | ||
| + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" | ||
| + ) | ||
| # export the targets (note that exporting backward_object does not make sense) | ||
| install(TARGETS backward_interface backward EXPORT BackwardTargets) | ||
| # install a CMake file for the exported targets |
Oops, something went wrong.
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.
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.
If I undesrtand this correctly, this would still install the header since it's being included as a subproject in our top level CMakeLists.txt file
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.
CMAKE_SOURCE_DIR should equal to the root of the gz-sim repository while PROJECT_SOURCE_DIR should be equal to the vendor/backwards-cpp subdirectory on top of the root of the gz-sim repository. So we are using it but the file is not a top-level project.
Uh oh!
There was an error while loading. Please reload this page.
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.
While the logic make sense, why not completely remove it since we are patching this already?
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.
@j-rivero, I agree. It would be simpler to remove the
installcalls.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.
ok, eb7b252