Commit Graph

8 Commits

Author SHA1 Message Date
Brian Gesiak
3123b47602 [cmake] Enable IN_LIST compare policy
Enable CMake policy CMP0057, which allows `if()` statements to use the `IN_LIST`
operator. In addition, simplify several `if()` statements that used the
`list(FIND ...)` operation instead.
2016-09-28 22:35:05 -04:00
Michael Gottesman
9e2a0b1979 [cmake] Fix Xcode build for Release LLVM + Debug Swift.
There were a couple of thinkos here that I had to fix. This passed on my
machine. Lets see if the bots agree.
2016-07-12 15:55:23 -07:00
Michael Gottesman
d65d5e3404 [cmake] Remove dead code. NFC. 2016-07-12 15:54:32 -07:00
Michael Gottesman
5c2cda0047 [cmake] Remove duplicated code. 2016-07-12 15:26:55 -07:00
Michael Gottesman
f71e544c62 [cmake] Fix thinko.
Instead of overwriting all of the paths for the other build configurations with
the one that LLVM selected, I was resetting the path for LLVM's build
configuration over and over again. = /.

This fixes the issue.
2016-07-12 13:58:16 -07:00
Michael Gottesman
b42b7f43d8 [cmake] Combine apply_xcode_substitutions and escape_llvm_path_for_xcode into a better escape_path_for_xcode that can be reused across cmake. 2016-07-08 09:51:18 -07:00
Michael Gottesman
455d3a1960 [cmake] Move the cmake xcode configuration code from SwiftSharedCMakeConfig.cmake => SwiftXcodeSupport.cmake. 2016-07-08 09:51:18 -07:00
Michael Gottesman
0e95abd35c [cmake] Move SwiftApplyXcodeSubstitutions.cmake => SwiftXcodeSupport.cmake.
As an additional fix, this moves the include of SwiftXcodeSupport to the one
place where its functionality is used, AddSwift.cmake. Keeping the include in
./CMakeLists.txt makes it seem like the functionality is needed there (when it
is not).

In a subsequent commit, I am going to refactor the xcode support I have been
adding to SwiftSharedCMakeConfig into this file and have SwiftSharedCMakeConfig
import it.
2016-07-08 09:51:18 -07:00