build: fix cmake DESTDIR support #85
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
sunyab
requested changes
Mar 13, 2017
cmake/macros/Public.cmake
Outdated
| @@ -885,12 +889,18 @@ function(pxr_setup_plugins) | |||
| # top-level plugin area | |||
| _get_resources_dir_name(resourcesDir) | |||
| set(plugInfoContents "{\\n \\\"Includes\\\": [ \\\"*/${resourcesDir}/\\\" ]\\n}\\n") | |||
There was a problem hiding this comment.
Now that we're not passing this variable through an install(CODE ...) block, I think the double-escaping needs to be removed, e.g.
set(plugInfoContents "{\n \"Includes\": [ \"*/${resourcesDir}/\" ]\n}\n")
cmake/macros/Public.cmake
Outdated
| file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/plugins_plugInfo.json" | ||
| "${plugInfoContents}") | ||
| install(FILES "${CMAKE_CURRENT_BINARY_DIR}/plugins_plugInfo.json" | ||
| DESTINATION "${SHARE_INSTALL_PREFIX}/plugins/plugInfo.json" |
There was a problem hiding this comment.
I think there's a typo here, as the CMake docs say the DESTINATION parameter is a directory name. Without this fix, the plugInfo.json file gets installed into the wrong place which breaks stuff at runtime.
DESTINATION "${SHARE_INSTALL_PREFIX}/plugins"
We were emitting cmake code that was attempting to write directly into the installation prefix. This breaks when building using DESTDIR because we are writing directly into the prefix without taking the DESTDIR into account. This breaks this common use case: make DESTDIR=/usr install Fix the build by writing the generated files into the cmake binary directory and then using a normal install(...) command to install them. This lets cmake handle the pathing, and thus DESTDIR will be correctly handled. Closes PixarAnimationStudios#84 Signed-off-by: David Aguilar <[email protected]>
|
Thanks for the careful review @sunyab . I've updated |
sunyab
approved these changes
Mar 17, 2017
pixar-oss
added a commit
that referenced
this pull request
Mar 17, 2017
build: fix cmake DESTDIR support
AdamFelt
pushed a commit
to autodesk-forks/USD
that referenced
this pull request
Apr 16, 2024
(cherry picked from commit 69dded842503e9d122d301131210db7061a45352)
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.
Fix issue #84 by generating files and installing them in separate steps.