Fix macro source location #910
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
When a project is used through a FetchContent/add_subdirectory, the
`CMAKE_SOURCE_DIR` path points to the calling project. This is resulting
in some of the CI jobs attempting to FetchContent the macros from
`swift-corelibs-foundation/Sources/FoundationMacros`, rather than
`swift-foundation/Sources/FoundationMacros`, ultimately failing the
build.
The `project` call sets a `${CMAKE_PROJECT_NAME}_SOURCE_DIR` variable to
the source directory of the project itself, making it more reliable.
`CMAKE_CURRENT_SOURCE_DIR` would also work here too.
|
@swift-ci please test |
al45tair
approved these changes
Sep 9, 2024
shahmishal
approved these changes
Sep 9, 2024
jmschonfeld
approved these changes
Sep 10, 2024
There was a problem hiding this comment.
Seems fine to me, but before merging could we kick off a cross-repo toolchain build to make sure this behaves as expected since this repo doesn't (yet) have tests for the CMake build? The new swift-integration-tests should ensure that the built macro loads as expected
cthielen
pushed a commit
to cthielen/swift-foundation
that referenced
this pull request
Nov 8, 2024
When a project is used through a FetchContent/add_subdirectory, the
`CMAKE_SOURCE_DIR` path points to the calling project. This is resulting
in some of the CI jobs attempting to FetchContent the macros from
`swift-corelibs-foundation/Sources/FoundationMacros`, rather than
`swift-foundation/Sources/FoundationMacros`, ultimately failing the
build.
The `project` call sets a `${CMAKE_PROJECT_NAME}_SOURCE_DIR` variable to
the source directory of the project itself, making it more reliable.
`CMAKE_CURRENT_SOURCE_DIR` would also work here too.
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.
When a project is used through a FetchContent/add_subdirectory, the
CMAKE_SOURCE_DIRpath points to the calling project. This is resulting in some of the CI jobs attempting to FetchContent the macros fromswift-corelibs-foundation/Sources/FoundationMacros, rather thanswift-foundation/Sources/FoundationMacros, ultimately failing the build.The
projectcall sets a${CMAKE_PROJECT_NAME}_SOURCE_DIRvariable to the source directory of the project itself, making it more reliable.CMAKE_CURRENT_SOURCE_DIRwould also work here too.Noticed in: https://ci.swift.org/view/all/job/swift-build-static-sdk/46