also update $CMAKE_PREFIX_PATH and $CMAKE_LIBRARY_PATH in generated module file#3176
Merged
akesandgren merged 5 commits intoeasybuilders:developfrom Feb 13, 2020
Merged
Conversation
houndci-bot
reviewed
Jan 24, 2020
houndci-bot
reviewed
Jan 24, 2020
In dry-run mode a list is assumed, but hoisting happens afterwards
In dry-run installdir usually does not exist so the whole block was skipped instead of entering the dry-run blocks
Expand all globs and iterate over combined list of paths per key This allows elimination of duplicate paths and greatly simplified code.
2735e04 to
0aea9a4
Compare
0662ed0 to
8dfbd25
Compare
Contributor
|
Going in, thanks @Flamefire! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Add CMAKE_PREFIX_PATH and CMAKE_LIBRARY_PATH to make_module_req which Fixes #2624
To avoid adding a non-required path to CMAKE_LIBRARY_PATH a check is needed that lib64 is not a symlink to lib. (CMake already searches lib)
This can also be used to avoid duplicate paths in the symlink situation when lib64 and lib would be added while only lib is required.
In extension by changing the iteration to iterate over the combined glob results per key, all duplicate paths can be removed.
This also fixes 2 bugs I found, where the string to list conversion was done after the first usage and the effectively disabled output from dry-run.