Skip to content

Commit b553a92

Browse files
authored
Merge pull request #40235 from cwakamo/eng/PR-85511244-fix-some-SourceKit-CMake-issues
[CMake] Fix a couple SourceKit CMake issues. This addresses <rdar://problem/85511244>.
2 parents c705d20 + c0b5925 commit b553a92

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

tools/SourceKit/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ include(AddSwiftSourceKit)
5252

5353
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
5454
# Choose a deployment target if none was set.
55-
set(SOURCEKIT_DEPLOYMENT_TARGET "" CACHE STRING
56-
"Deployment target for SourceKit.")
5755
if (NOT SOURCEKIT_DEPLOYMENT_TARGET)
5856
execute_process(COMMAND sw_vers -productVersion
5957
OUTPUT_VARIABLE SOURCEKIT_DEPLOYMENT_TARGET

tools/SourceKit/tools/sourcekitd/bin/InProc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ target_link_libraries(sourcekitdInProc PRIVATE
5555
# that is in the same directory as the swift library directory.
5656
if (SOURCEKITD_BUILD_STATIC_INPROC)
5757
add_sourcekit_library(sourcekitdInProc_Static
58+
${sourcekitdInProc_args}
5859
HEADERS
5960
${SOURCEKITD_SOURCE_DIR}/include/sourcekitd/sourcekitd.h
60-
${sourcekitdInProc_args}
6161
)
6262
target_link_libraries(sourcekitdInProc_Static PRIVATE
6363
SourceKitSwiftLang

0 commit comments

Comments
 (0)