Fix assumption that CMAKE_INSTALL_*DIR paths are relative. #66
+11
−4
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
lopsided98
force-pushed
the
cmake-absolute-paths
branch
2 times, most recently
from
185ca35 to
c9c9931
Compare
|
I fixed the conflicts and tested the updated patch. I would appreciate getting this reviewed, since we depend on this patch to build this package in nixpkgs. |
lopsided98
force-pushed
the
cmake-absolute-paths
branch
from
c9c9931 to
1c13e9a
Compare
lopsided98
force-pushed
the
cmake-absolute-paths
branch
4 times, most recently
from
4936c97 to
6e0cea1
Compare
muellerbernd
added a commit
to muellerbernd/urdfdom_headers
that referenced
this pull request
Jan 29, 2024
muellerbernd
added a commit
to muellerbernd/urdfdom_headers
that referenced
this pull request
Jan 29, 2024
Signed-off-by: Bernd Müller <[email protected]>
This solution uses relative paths if possible, allowing the package to be relocatable, but still works correctly if CMAKE_INSTALL_*DIR paths are absolute. Signed-off-by: Ben Wolsieffer <[email protected]>
lopsided98
force-pushed
the
cmake-absolute-paths
branch
from
6e0cea1 to
fa89f2d
Compare
|
I fixed the conflicts again. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
The
CMAKE_INSTALL_*DIRvariables are allowed to contain absolute paths according to the CMake documentation. This PR fixes the handling of these absolute paths while retaining the current behavior if they are relative. I also fixed the hardcodedincludedirin the pkg-config file.See https://github.com/jtojnar/cmake-snips#assuming-cmake_install_dir-is-relative-path for more information about this problem.