Tensorflow Windows fixes #29656
Merged
Tensorflow Windows fixes #29656
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
This simplifies the ICU flags handling. This inlines the use into just the library case, as the ICU usage is for the standard library targets only. It uses CMake to properly add the include paths as a system search path. This should fix the Linux builds as the include flags were being de-duplicated as we are now using CMake more than we were previously.
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.
Member
Author
|
@swift-ci please test tensorflow |
Member
Author
|
This fixes the last merge which didn't catch the fixes after the tag |
dan-zheng
approved these changes
Feb 5, 2020
Contributor
dan-zheng
left a comment
dan-zheng
left a comment
There was a problem hiding this comment.
LGTM if this fixes the Windows build! I'm not sure how to verify that.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.