build: use modern target property handling #29451
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
|
@swift-ci please clean test |
|
Build failed |
|
Build failed |
compnerd
force-pushed
the
someone-else-can-do-it
branch
from
6cd1c96 to
04adc97
Compare
|
@swift-ci please clean test |
|
Build failed |
|
Build failed |
compnerd
force-pushed
the
someone-else-can-do-it
branch
from
04adc97 to
4970eb3
Compare
|
@swift-ci please clean test |
|
Build failed |
|
@swift-ci please clean test |
|
Build failed |
Use specific operations for setting the compile flags, link flags, linked libraries, and library search paths. This allows us to use CMake more effectively, simplifies the logic, and will ensure that flags are not duplicated.
compnerd
force-pushed
the
someone-else-can-do-it
branch
from
4970eb3 to
d8b3b62
Compare
|
@swift-ci please clean test |
|
Build failed |
|
@swift-ci please clean test |
compnerd
added a commit
to compnerd/apple-swift
that referenced
this pull request
Jan 28, 2020
This should repair the Windows build after swiftlang#29451. The quoting behaviour was incorrect and was constructing an invalid compiler invocation. Solve the issue by using `target_include_directories` instead. However, since this needs the target, hoist the flag computation to the local sites. This replicates more logic because of the custom build trying to replicate the CMake build logic in CMake.
drodriguez
added a commit
to drodriguez/swift
that referenced
this pull request
Jan 28, 2020
Before the result of `_add_variant_c_compile_flags` was a string, so appending several "-isystem" was not a problem. With swiftlang#29451 the rules have changed since the list is now handled by CMake, and it deduplicates the repeated members in the list. Thanks, CMake. Should fix the Android CI builds that were failing since the merging of swiftlang#29451.
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jan 28, 2020
Collate -F with the framework path to avoid unwanted deduplication of options by `target_compile_options` (which is the case after swiftlang#29451) -- this way no undesired side effects are introduced should a new search path be added. Addresses rdar://problem/58934566
edymtt
added a commit
that referenced
this pull request
Jan 28, 2020
Collate -F with the framework path to avoid unwanted deduplication of options by `target_compile_options` (which is the case after #29451) -- this way no undesired side effects are introduced should a new search path be added. Addresses rdar://problem/58934566
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Feb 4, 2020
Generator expressions seem not to allow the `LINKER:` prefix to be expanded correctly when used in `target_link_options`. To solve this, undo the change from swiftlang#29451 and instead use an `if` statement to add the flag when needed. Addresses rdar://problem/59117166
compnerd
added a commit
that referenced
this pull request
Feb 5, 2020
This should repair the Windows build after #29451. The quoting behaviour was incorrect and was constructing an invalid compiler invocation. Solve the issue by using `target_include_directories` instead. However, since this needs the target, hoist the flag computation to the local sites. This replicates more logic because of the custom build trying to replicate the CMake build logic in CMake.
finagolfin
added a commit
to finagolfin/swift
that referenced
this pull request
Jul 29, 2020
There was a mixup in swiftlang#29451 and a CMake flag was dropped, this puts it back. Resolves SR-13315
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.
Use specific operations for setting the compile flags, link flags,
linked libraries, and library search paths. This allows us to use CMake
more effectively, simplifies the logic, and will ensure that flags are
not duplicated.
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.