Skip to content

Commit 057eddb

Browse files
committed
---
yaml --- r: 347311 b: refs/heads/master c: 595df9e h: refs/heads/master i: 347309: 8970fd7 347307: c988347 347303: ac7ee78 347295: a816f2a
1 parent 2363c48 commit 057eddb

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
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: 70e88ccc24460be7eabb52bb7403fdee5e9b155c
2+
refs/heads/master: 595df9e586df43bba7ba9bf084c5062e6cb46759
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: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,31 @@ include(CheckSymbolExists)
44
list(APPEND CMAKE_MODULE_PATH
55
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
66

7+
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
8+
message(SEND_ERROR "SourceKit cannot be built standalone")
9+
endif()
10+
11+
if(NOT CMAKE_C_COMPILER_ID MATCHES Clang)
12+
if(CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME)
13+
get_target_property(CLANG_LOCATION clang LOCATION)
14+
get_filename_component(CLANG_LOCATION ${CLANG_LOCATION} DIRECTORY)
15+
16+
if(CMAKE_C_COMPILER_ID STREQUAL MSVC OR CMAKE_C_SIMULATE_ID STREQUAL MSVC)
17+
set(CMAKE_C_COMPILER_ID
18+
${CLANG_LOCATION}/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
19+
set(CMAKE_CXX_COMPILER_ID
20+
${CLANG_LOCATION}/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
21+
else()
22+
set(CMAKE_C_COMPILER_ID
23+
${CLANG_LOCATION}/clang${CMAKE_EXECUTABLE_SUFFIX})
24+
set(CMAKE_CXX_COMPILER_ID
25+
${CLANG_LOCATION}/clang++${CMAKE_EXECUTABLE_SUFFIX})
26+
endif()
27+
else()
28+
message(SEND_ERROR "SourceKit requires a clang based compiler")
29+
endif()
30+
endif()
31+
732
if (DARWIN_TOOLCHAIN_VERSION)
833
set(SOURCEKIT_VERSION_STRING "${DARWIN_TOOLCHAIN_VERSION}")
934
else()

0 commit comments

Comments
 (0)