-
Notifications
You must be signed in to change notification settings - Fork 46
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
Conditionally modify envvar vs. global CMAKE_PREFIX_PATH in rapids_cmake_support_conda_env
#439
Merged
rapids-bot
merged 11 commits into
rapidsai:branch-23.08
from
trxcllnt:fix/support_conda_env-modify-cmake_prefix_path-envvar
Jul 20, 2023
Merged
Conditionally modify envvar vs. global CMAKE_PREFIX_PATH in rapids_cmake_support_conda_env
#439
rapids-bot
merged 11 commits into
rapidsai:branch-23.08
from
trxcllnt:fix/support_conda_env-modify-cmake_prefix_path-envvar
Jul 20, 2023
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
…ify the CMAKE_PREFIX_PATH envvar
trxcllnt
added
improvement
Improves an existing functionality
non-breaking
Introduces a non-breaking change
3 - Ready for Review
Ready for review by team
labels
Jul 20, 2023
robertmaynard
requested changes
Jul 20, 2023
robertmaynard
requested changes
Jul 20, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should prefer usingDEFINED
since it makes it clearer.
If some user some how defines CMAKE_PREFIX_PATH
to a empty string, they win an award :)
Co-authored-by: Robert Maynard <[email protected]>
robertmaynard
approved these changes
Jul 20, 2023
/merge |
trxcllnt
deleted the
fix/support_conda_env-modify-cmake_prefix_path-envvar
branch
July 21, 2023 19:00
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
3 - Ready for Review
Ready for review by team
improvement
Improves an existing functionality
non-breaking
Introduces a non-breaking change
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.
Description
This PR updates the logic when
rapids_cmake_support_conda_env()
is called withMODIFY_PREFIX_PATH
.The current logic prepends the
$PREFIX
/$BUILD_PREFIX
/$CONDA_PREFIX
paths to the globalCMAKE_PREFIX_PATH
variable.This PR proposes the following changes:
$PREFIX
/$BUILD_PREFIX
/$CONDA_PREFIX
pathsCMAKE_PREFIX_PATH
environment variable instead of the globalCMAKE_PREFIX_PATH
variableCMAKE_PREFIX_PATH
variable if it's already populated (preserving paths inENV{CMAKE_PREFIX_PATH}
)Checklist
cmake-format.json
is up to date with these changes.include_guard(GLOBAL)
)