[cxx-interop] Copy bridging header to same directory as other headers #72201
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
|
@swift-ci please test |
kalebers
approved these changes
Mar 12, 2024
|
Thanks @drodriguez! |
The `bridging` header for C++ interop was calculating an include directory using `CMAKE_BINARY_DIR` and `CMAKE_CFG_INTDIR` while the rest of the headers consistently use `CMAKE_CURRENT_BINARY_DIR` and no `CMAKE_CFG_INTDIR`. In some configurations of CMake (for example when using Swift as an external project of LLVM and building an unified toolchain), this means that the `brigding` header will end up in a different directory than the rest of the headers, which complicates testing. The changes in this commit reuses `SWIFT_INCLUDE_DIR` to keep consistency with the rest of the headers. Any build started by `build-script` should not notice the difference.
drodriguez
force-pushed
the
cxx-bridging-header-location
branch
from
0ed9f18 to
c5580b2
Compare
|
@swift-ci please test |
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.
The
bridgingheader for C++ interop was calculating an include directory usingCMAKE_BINARY_DIRandCMAKE_CFG_INTDIRwhile the rest of the headers consistently useCMAKE_CURRENT_BINARY_DIRand noCMAKE_CFG_INTDIR.In some configurations of CMake (for example when using Swift as an external project of LLVM and building an unified toolchain), this means that the
brigdingheader will end up in a different directory than the rest of the headers, which complicates testing.The changes in this commit reuses
SWIFT_INCLUDE_DIRto keep consistency with the rest of the headers. Any build started bybuild-scriptshould not notice the difference.