Skip to content

Commit daca1c0

Browse files
committed
---
yaml --- r: 347338 b: refs/heads/master c: 99bcb43 h: refs/heads/master
1 parent 5aacf5e commit daca1c0

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: fd936c052d2a131aee35ca66eecd753d1f0951f8
2+
refs/heads/master: 99bcb43e199eb0d719701c957399e71ab0e6f183
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/tools/SourceKit/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ if(NOT CMAKE_C_COMPILER_ID MATCHES Clang)
1313
get_target_property(CLANG_LOCATION clang LOCATION)
1414
get_filename_component(CLANG_LOCATION ${CLANG_LOCATION} DIRECTORY)
1515

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
1819
${CLANG_LOCATION}/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
19-
set(CMAKE_CXX_COMPILER_ID
20+
set(CMAKE_CXX_COMPILER
2021
${CLANG_LOCATION}/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
2122
else()
22-
set(CMAKE_C_COMPILER_ID
23+
set(CMAKE_C_COMPILER
2324
${CLANG_LOCATION}/clang${CMAKE_EXECUTABLE_SUFFIX})
24-
set(CMAKE_CXX_COMPILER_ID
25+
set(CMAKE_CXX_COMPILER
2526
${CLANG_LOCATION}/clang++${CMAKE_EXECUTABLE_SUFFIX})
2627
endif()
2728
else()

0 commit comments

Comments
 (0)