cmake: add support for DESTDIR install relocation #5152
Merged
Conversation
This file contains 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
|
add to whitelist |
|
run arm tests |
CMake might change the value of CMAKE_INSTALL_PREFIX on the fly at install time in case the install is relocated via DESTDIR. This is only supported in case the paths of the install target are encoded as relative path. These paths are anyways located relative to the CMAKE_INSTALL_PREFIX, so manually specifying the prefix there is not required. This patch enables a user to install multiple DynamoRIO versions simultaneously and to switch between them by using tools like xstow. It also helps as a preparation to package DynamoRIO for Linux distributions like Debian. Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
fmoessbauer
force-pushed
the
chore-destdir
branch
from
d222c3e to
cd42080
Compare
This patch replaces the install(CODE) commands that generate files on the fly. Instead, the files are generated at configuration time and just copied at install time. By that, install relocation via various strategies like DESTDIR and CPack works correctly. Further, this gets rid of a lot of complex escaping and makes the results more predictable. When appending to cmake-generated files, we also ensure that the file is cleared on a re-configuration run to avoid duplicates in the file. Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
|
The initial strategy did not work under e.g. CPack. In general, the One thing I stumbles upon, but let it as it is: DR_target_install(CODE "file(APPEND \"${PROJECT_BINARY_DIR}/CMakeFiles/Export/cmake/${exported_targets_name}.cmake\" \"${exported_targets_append}\")")There, files in the PROJECT_BINARY_DIR are modified. This just works because the command will be executed prior to the target install (can be checked by reading @derekbruening : Could you please trigger the pipeline, so I can compare the generated packages? |
derekbruening
added a commit
that referenced
this pull request
Oct 10, 2021
9 tasks
derekbruening
approved these changes
Oct 12, 2021
|
Thank you for the contribution. |
derekbruening
pushed a commit
that referenced
this pull request
Oct 12, 2021
…5152) This patch replaces the install(CODE) commands that generate files on the fly. Instead, the files are generated at configuration time and just copied at install time. By that, install relocation via various strategies like DESTDIR and CPack works correctly. Further, this gets rid of a lot of complex escaping and makes the results more predictable. When appending to cmake-generated files, we also ensure that the file is cleared on a re-configuration run to avoid duplicates in the file. This patch enables a user to install multiple DynamoRIO versions simultaneously and to switch between them by using tools like xstow. It also helps as a preparation to package DynamoRIO for Linux distributions like Debian. Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> Issue: #5153
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.
CMake might change the value of CMAKE_INSTALL_PREFIX on the fly at
install time in case the install is relocated via DESTDIR.
This is only supported in case the paths of the install target are
encoded as relative path.
These paths are anyways located relative to the CMAKE_INSTALL_PREFIX,
so manually specifying the prefix there is not required.
This patch enables a user to install multiple DynamoRIO versions
simultaneously and to switch between them by using tools like xstow.
It also helps as a preparation to package DynamoRIO for Linux
distributions like Debian.
Signed-off-by: Felix Moessbauer felix.moessbauer@siemens.com