-
Notifications
You must be signed in to change notification settings - Fork 45
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
Use computed relative extras path #359
Conversation
Use PROJECT_CMAKE_EXTRAS_INSTALL_DIR and PROJECT_CMAKE_EXTRAS_PATH_TO_PREFIX to improve support for arch-dependent lib folders. Signed-off-by: Steve Peters <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #359 +/- ##
=======================================
Coverage 96.89% 96.89%
=======================================
Files 28 28
Lines 1064 1064
=======================================
Hits 1031 1031
Misses 33 33 |
the homebrew build is passing because of the changes in the following branch: we'll need to make a gz-cmake3 release in order to keep homebrew working |
CI is happy now that gazebosim/gz-cmake#362 is merged and new nightlies have been built |
We are using in this PR new gz-cmake variables introduced in gazebosim/gz-cmake#362 if I'm not wrong. If that is the case, we are going to need a version requirement in the |
As a side note, if we are going to use these variables exported from |
this is a great point. We are currently documenting only some of the input parameters to |
@j-rivero I've started on the documentation in gazebosim/gz-cmake#364; please let me know what you think |
@osrf-jenkins run tests please |
This reverts commit 786b42a. Signed-off-by: Michael Carroll <[email protected]>
* Revert "Use cmake extras path variables (#359)" This reverts commit 786b42a. Signed-off-by: Michael Carroll <[email protected]> * Revert "Unconditionally find the python interpreter (#356)" This reverts commit 16de9ef. Signed-off-by: Michael Carroll <[email protected]> * Revert "Generate messages in downstream builds (#339)" This reverts commit 0c78b96. Signed-off-by: Michael Carroll <[email protected]> --------- Signed-off-by: Michael Carroll <[email protected]>
🦟 Bug fix
Needed by gazebosim/gz-transport#398, follow-up to gazebosim/gz-cmake#360 and #339 (comment)
Summary
Use
PROJECT_CMAKE_EXTRAS_INSTALL_DIR
andPROJECT_CMAKE_EXTRAS_PATH_TO_PREFIX
to improve support for arch-dependent lib folders. In particular, the fixed relative path../../..
is incorrect when installing to/usr
on debian systems, so the computed relative pathPROJECT_CMAKE_EXTRAS_PATH_TO_PREFIX
is used instead. Also install the other cmake extras toPROJECT_CMAKE_EXTRAS_INSTALL_DIR
.Checklist
codecheck
passed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-by
messages.