[Build System: CMake] Add CMake module paths before importing in StandaloneOverlay.cmake #24706
+6
−5
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
…daloneOverlay.cmake.
|
@swift-ci please smoke test |
compnerd
reviewed
May 11, 2019
| @@ -9,6 +9,12 @@ if(DEFINED SWIFT_MASTER_LOADED | |||
| endif() | |||
|
|
|||
|
|
|||
| list(APPEND CMAKE_MODULE_PATH | |||
| "${SWIFT_SOURCE_ROOT}/llvm/cmake/modules" | |||
There was a problem hiding this comment.
There is no guarantee that SWIFT_SOURCE_ROOT is defined. I think it might be better to rely on the standard behaviour of CMake:
find_package(LLVM CONFIG REQUIRED)
That will error out if the user does not specify LLVM_DIR or does not have LLVM installed and available on the system.
There was a problem hiding this comment.
In all cases where this module is currently used it should be safe to assume that SWIFT_SOURCE_ROOT is defined. I hope to remove the need for this extra system in the near future (should it be possible) then we won't have to worry about this odd inconsistency.
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.
No description provided.