File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: fd936c052d2a131aee35ca66eecd753d1f0951f8
2
+ refs/heads/master: 99bcb43e199eb0d719701c957399e71ab0e6f183
3
3
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
4
4
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
5
5
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
Original file line number Diff line number Diff line change @@ -13,15 +13,16 @@ if(NOT CMAKE_C_COMPILER_ID MATCHES Clang)
13
13
get_target_property (CLANG_LOCATION clang LOCATION )
14
14
get_filename_component (CLANG_LOCATION ${CLANG_LOCATION} DIRECTORY )
15
15
16
- if (CMAKE_C_COMPILER_ID STREQUAL MSVC OR CMAKE_C_SIMULATE_ID STREQUAL MSVC )
17
- set (CMAKE_C_COMPILER_ID
16
+ if ("${CMAKE_C_COMPILER_ID} " STREQUAL "MSVC" OR
17
+ "${CMAKE_C_SIMULATE_ID} " STREQUAL "MSVC" )
18
+ set (CMAKE_C_COMPILER
18
19
${CLANG_LOCATION} /clang-cl${CMAKE_EXECUTABLE_SUFFIX} )
19
- set (CMAKE_CXX_COMPILER_ID
20
+ set (CMAKE_CXX_COMPILER
20
21
${CLANG_LOCATION} /clang-cl${CMAKE_EXECUTABLE_SUFFIX} )
21
22
else ()
22
- set (CMAKE_C_COMPILER_ID
23
+ set (CMAKE_C_COMPILER
23
24
${CLANG_LOCATION} /clang${CMAKE_EXECUTABLE_SUFFIX} )
24
- set (CMAKE_CXX_COMPILER_ID
25
+ set (CMAKE_CXX_COMPILER
25
26
${CLANG_LOCATION} /clang++${CMAKE_EXECUTABLE_SUFFIX} )
26
27
endif ()
27
28
else ()
You can’t perform that action at this time.
0 commit comments