build: support embedding in other CMake projects #382
Merged
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
Allow libdispatch to be embedded in other CMake projects using add_subdirectory(). This essentially means that `CMAKE_SOURCE_DIR` and `CMAKE_BINARY_DIR` cannot be used directly. Use the versions of these variables which are scoped to the current project or directory.
|
This really is functionally equivalent. No real strong feelings on this. Up to @MadCoder or @millenomi |
|
@swift-ci test |
| @@ -1,7 +1,7 @@ | |||
|
|
|||
| cmake_minimum_required(VERSION 3.4.3) | |||
|
|
|||
| list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") | |||
| list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") | |||
There was a problem hiding this comment.
Why is this CMAKE_CURRENT_SOURCE_DIR and not PROJECT_SOURCE_DIR like everywhere else?
There was a problem hiding this comment.
The PROJECT_* variables are set by the project() command, which is called below this, so they aren't available yet. I assume that the module path is intentionally set before calling project() because it could allow for defining custom platform/toolchain modules that get picked up by the command.
ktopley-apple
suggested changes
Aug 20, 2018
ktopley-apple
approved these changes
Aug 20, 2018
ktopley-apple
added a commit
that referenced
this pull request
Dec 6, 2018
build: support embedding in other CMake projects Signed-off-by: Kim Topley <[email protected]>
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.
Allow libdispatch to be embedded in other CMake projects using
add_subdirectory(). This essentially means that
CMAKE_SOURCE_DIRandCMAKE_BINARY_DIRcannot be used directly. Use the versions of these variableswhich are scoped to the current project or directory.