Skip to content

Commit 1837d19

Browse files
bnbarhambnbarham
committed
[CMake] Updates to allow inclusion using FetchContent
Various updates that allow swift-syntax to be included using FetchContent. Mostly this is just not replacing `target_link_libraries` since that is a global replacement, but we also now use a couple of variables from the swift if they're set (eg. `SWIFT_HOST_LIBRARIES_DEST_DIR` and `SWIFT_HOST_MODULE_TRIPLE`).
1 parent 56ef324 commit 1837d19

File tree

15 files changed

+109
-92
lines changed

15 files changed

+109
-92
lines changed

‎CMakeLists.txt

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,22 @@ project(SwiftSyntax LANGUAGES C Swift)
1515
set(SWIFT_VERSION 5)
1616
set(CMAKE_Swift_LANGUAGE_VERSION ${SWIFT_VERSION})
1717

18+
if(CMAKE_VERSION VERSION_LESS 3.21)
19+
get_property(parent_dir DIRECTORY PROPERTY PARENT_DIRECTORY)
20+
if(NOT parent_dir)
21+
set(PROJECT_IS_TOP_LEVEL TRUE)
22+
endif()
23+
endif()
24+
1825
# The subdirectory into which host libraries will be installed.
1926
set(SWIFT_HOST_LIBRARIES_SUBDIRECTORY "swift/host")
20-
21-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}")
22-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}")
27+
if(SWIFT_HOST_LIBRARIES_DEST_DIR)
28+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${SWIFT_HOST_LIBRARIES_DEST_DIR}")
29+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${SWIFT_HOST_LIBRARIES_DEST_DIR}")
30+
else()
31+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}")
32+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}")
33+
endif()
2334

2435
set(CMAKE_MACOSX_RPATH YES)
2536

@@ -50,22 +61,25 @@ if (NOT SWIFT_SUPPORTS_DISABLE_IMPLICIT_STRING_PROCESSING_MODULE_IMPORT)
5061
endif()
5162

5263
# Determine the module triple.
53-
# FIXME: This is a hack. It's all a hack. Windows isn't setting
54-
# CMAKE_Swift_COMPILER_TARGET.
55-
if(CMAKE_Swift_COMPILER_TARGET)
56-
string(REGEX REPLACE "macosx[0-9]+([.][0-9]+)?" "macos" SWIFT_MODULE_TRIPLE
57-
${CMAKE_Swift_COMPILER_TARGET})
58-
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
59-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
60-
set(SWIFT_MODULE_TRIPLE "x86_64-unknown-windows-msvc")
61-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|arm64")
62-
set(SWIFT_MODULE_TRIPLE "aarch64-unknown-windows-msvc")
64+
if("${SWIFT_HOST_MODULE_TRIPLE}" STREQUAL "")
65+
# FIXME: This is a hack. It's all a hack. Windows isn't setting
66+
# CMAKE_Swift_COMPILER_TARGET.
67+
if(CMAKE_Swift_COMPILER_TARGET)
68+
string(REGEX REPLACE "macosx[0-9]+([.][0-9]+)?" "macos" SWIFT_HOST_MODULE_TRIPLE
69+
${CMAKE_Swift_COMPILER_TARGET})
70+
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
71+
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
72+
set(SWIFT_HOST_MODULE_TRIPLE "x86_64-unknown-windows-msvc")
73+
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|arm64")
74+
set(SWIFT_HOST_MODULE_TRIPLE "aarch64-unknown-windows-msvc")
75+
else()
76+
message(FATAL_ERROR "Unrecognized architecture for Windows host")
77+
endif()
6378
else()
64-
message(FATAL_ERROR "Unrecognized architecture for Windows host")
79+
message(FATAL_ERROR "Host module triple required")
6580
endif()
6681
endif()
67-
68-
message(STATUS "Module triple: ${SWIFT_MODULE_TRIPLE}")
82+
message(STATUS "Module triple: ${SWIFT_HOST_MODULE_TRIPLE}")
6983

7084
# Force single-threaded-only syntax trees to eliminate the Darwin
7185
# dependency in the compiler.
@@ -80,9 +94,9 @@ endif()
8094

8195
add_subdirectory(Sources)
8296

83-
export(EXPORT SwiftSyntaxTargets
84-
FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftSyntaxTargets.cmake"
85-
NAMESPACE SwiftSyntax::
86-
)
87-
88-
add_subdirectory(cmake/modules)
97+
if(PROJECT_IS_TOP_LEVEL)
98+
export(EXPORT SwiftSyntaxTargets
99+
FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftSyntaxTargets.cmake"
100+
NAMESPACE SwiftSyntax::
101+
)
102+
endif()

‎Sources/CMakeLists.txt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,6 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
# cmake generation for Swift adds an order only dependency, which matches how C-family languages
10-
# works. In that case, however, ninja (and presumably other generators) will rebuild on header
11-
# changes. That's not the case for Swift, and thus if A -> B, A is not being rebuilt when the
12-
# ABI/API of B changes.
13-
#
14-
# For now workaround this by touching a file whenever B is rebuilt and then compiling that file as
15-
# part of A. Ideally this file would be generated by each of the targets, but that dependency didn't
16-
# seem to be being tracked.
17-
#
18-
# Remove once rdar://102202478 is fixed.
19-
function(target_link_libraries TARGET)
20-
cmake_parse_arguments(ARGS "" "" "PUBLIC" ${ARGN})
21-
22-
_target_link_libraries(${TARGET} PUBLIC ${ARGS_PUBLIC})
23-
foreach(DEPENDENCY ${ARGS_PUBLIC})
24-
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/forced-${DEPENDENCY}-dep.swift
25-
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/forced-${DEPENDENCY}-dep.swift
26-
DEPENDS ${DEPENDENCY}
27-
)
28-
target_sources(${TARGET} PRIVATE
29-
${CMAKE_CURRENT_BINARY_DIR}/forced-${DEPENDENCY}-dep.swift
30-
)
31-
endforeach()
32-
endfunction()
33-
349
add_subdirectory(SwiftBasicFormat)
3510
add_subdirectory(SwiftSyntax)
3611
add_subdirectory(SwiftDiagnostics)

‎Sources/SwiftBasicFormat/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
add_swift_host_library(SwiftBasicFormat
9+
add_swift_syntax_library(SwiftBasicFormat
1010
BasicFormat.swift
1111
generated/BasicFormat+Extensions.swift
1212
SyntaxProtocol+Formatted.swift
1313
Trivia+FormatExtensions.swift
1414
)
1515

16-
target_link_libraries(SwiftBasicFormat PUBLIC
16+
target_link_swift_syntax_libraries(SwiftBasicFormat PUBLIC
1717
SwiftSyntax)

‎Sources/SwiftCompilerPluginMessageHandling/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
add_swift_host_library(SwiftCompilerPluginMessageHandling
9+
add_swift_syntax_library(SwiftCompilerPluginMessageHandling
1010
CompilerPluginMessageHandler.swift
1111
Diagnostics.swift
1212
Macros.swift
1313
PluginMacroExpansionContext.swift
1414
PluginMessages.swift
1515
)
1616

17-
target_link_libraries(SwiftCompilerPluginMessageHandling PUBLIC
17+
target_link_swift_syntax_libraries(SwiftCompilerPluginMessageHandling PUBLIC
1818
SwiftSyntax
1919
SwiftBasicFormat
2020
SwiftDiagnostics

‎Sources/SwiftDiagnostics/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
add_swift_host_library(SwiftDiagnostics
9+
add_swift_syntax_library(SwiftDiagnostics
1010
Diagnostic.swift
1111
DiagnosticsFormatter.swift
1212
FixIt.swift
@@ -15,5 +15,5 @@ add_swift_host_library(SwiftDiagnostics
1515
Note.swift
1616
)
1717

18-
target_link_libraries(SwiftDiagnostics PUBLIC
18+
target_link_swift_syntax_libraries(SwiftDiagnostics PUBLIC
1919
SwiftSyntax)

‎Sources/SwiftIDEUtils/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
add_swift_host_library(SwiftIDEUtils
9+
add_swift_syntax_library(SwiftIDEUtils
1010
generated/SyntaxClassification.swift
1111
Syntax+Classifications.swift
1212
SyntaxClassifier.swift
1313
)
1414

15-
target_link_libraries(SwiftIDEUtils PUBLIC
15+
target_link_swift_syntax_libraries(SwiftIDEUtils PUBLIC
1616
SwiftSyntax)

‎Sources/SwiftOperators/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
add_swift_host_library(SwiftOperators
9+
add_swift_syntax_library(SwiftOperators
1010
Operator.swift
1111
OperatorError+Diagnostics.swift
1212
OperatorError.swift
@@ -19,7 +19,7 @@ add_swift_host_library(SwiftOperators
1919
SyntaxSynthesis.swift
2020
)
2121

22-
target_link_libraries(SwiftOperators PUBLIC
22+
target_link_swift_syntax_libraries(SwiftOperators PUBLIC
2323
SwiftSyntax
2424
SwiftDiagnostics
2525
SwiftParser)

‎Sources/SwiftParser/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
add_swift_host_library(SwiftParser
9+
add_swift_syntax_library(SwiftParser
1010
Attributes.swift
1111
Availability.swift
1212
CharacterInfo.swift
@@ -49,6 +49,6 @@ add_swift_host_library(SwiftParser
4949
Lexer/UnicodeScalarExtensions.swift
5050
)
5151

52-
target_link_libraries(SwiftParser PUBLIC
52+
target_link_swift_syntax_libraries(SwiftParser PUBLIC
5353
SwiftSyntax
5454
SwiftDiagnostics)

‎Sources/SwiftParserDiagnostics/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
add_swift_host_library(SwiftParserDiagnostics
9+
add_swift_syntax_library(SwiftParserDiagnostics
1010
DiagnosticExtensions.swift
1111
LexerDiagnosticMessages.swift
1212
MissingNodesError.swift
@@ -23,7 +23,7 @@ add_swift_host_library(SwiftParserDiagnostics
2323
generated/TokenNameForDiagnostics.swift
2424
)
2525

26-
target_link_libraries(SwiftParserDiagnostics PUBLIC
26+
target_link_swift_syntax_libraries(SwiftParserDiagnostics PUBLIC
2727
SwiftBasicFormat
2828
SwiftDiagnostics
2929
SwiftParser

‎Sources/SwiftSyntax/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
add_swift_host_library(SwiftSyntax
9+
add_swift_syntax_library(SwiftSyntax
1010
AbsolutePosition.swift
1111
Assert.swift
1212
BumpPtrAllocator.swift

‎Sources/SwiftSyntaxBuilder/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
add_swift_host_library(SwiftSyntaxBuilder
9+
add_swift_syntax_library(SwiftSyntaxBuilder
1010
ConvenienceInitializers.swift
1111
Indenter.swift
1212
ResultBuilderExtensions.swift
@@ -22,7 +22,7 @@ add_swift_host_library(SwiftSyntaxBuilder
2222
generated/SyntaxExpressibleByStringInterpolationConformances.swift
2323
)
2424

25-
target_link_libraries(SwiftSyntaxBuilder PUBLIC
25+
target_link_swift_syntax_libraries(SwiftSyntaxBuilder PUBLIC
2626
SwiftBasicFormat
2727
SwiftParser
2828
SwiftParserDiagnostics

‎Sources/SwiftSyntaxMacroExpansion/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
add_swift_host_library(SwiftSyntaxMacroExpansion
1+
add_swift_syntax_library(SwiftSyntaxMacroExpansion
22
MacroExpansion.swift
33
)
44

5-
target_link_libraries(SwiftSyntaxMacroExpansion PUBLIC
5+
target_link_swift_syntax_libraries(SwiftSyntaxMacroExpansion PUBLIC
66
SwiftSyntax
77
SwiftSyntaxMacros
88
)

‎Sources/SwiftSyntaxMacros/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
add_swift_host_library(SwiftSyntaxMacros
9+
add_swift_syntax_library(SwiftSyntaxMacros
1010
MacroProtocols/AccessorMacro.swift
1111
MacroProtocols/AttachedMacro.swift
1212
MacroProtocols/CodeItemMacro.swift
@@ -29,7 +29,7 @@ add_swift_host_library(SwiftSyntaxMacros
2929
Syntax+MacroEvaluation.swift
3030
)
3131

32-
target_link_libraries(SwiftSyntaxMacros PUBLIC
32+
target_link_swift_syntax_libraries(SwiftSyntaxMacros PUBLIC
3333
SwiftParser
3434
SwiftSyntaxBuilder
3535
)

‎cmake/modules/AddSwiftHostLibrary.cmake

Lines changed: 52 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,44 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9+
# cmake generation for Swift adds an order only dependency, which matches how C-family languages
10+
# works. In that case, however, ninja (and presumably other generators) will rebuild on header
11+
# changes. That's not the case for Swift, and thus if A -> B, A is not being rebuilt when the
12+
# ABI/API of B changes.
13+
#
14+
# For now workaround this by touching a file whenever B is rebuilt and then compiling that file as
15+
# part of A. Ideally this file would be generated by each of the targets, but that dependency didn't
16+
# seem to be being tracked.
17+
#
18+
# Remove once rdar://102202478 is fixed.
19+
function(target_link_swift_syntax_libraries TARGET)
20+
cmake_parse_arguments(ARGS "" "" "PUBLIC" ${ARGN})
21+
22+
target_link_libraries(${TARGET} PUBLIC ${ARGS_PUBLIC})
23+
foreach(DEPENDENCY ${ARGS_PUBLIC})
24+
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/forced-${DEPENDENCY}-dep.swift
25+
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/forced-${DEPENDENCY}-dep.swift
26+
DEPENDS ${DEPENDENCY}
27+
)
28+
target_sources(${TARGET} PRIVATE
29+
${CMAKE_CURRENT_BINARY_DIR}/forced-${DEPENDENCY}-dep.swift
30+
)
31+
endforeach()
32+
endfunction()
33+
934
# Add a new host library with the given name.
10-
function(add_swift_host_library name)
35+
function(add_swift_syntax_library name)
1136
set(ASHL_SOURCES ${ARGN})
1237

1338
# Create the library target.
1439
add_library(${name} ${ASHL_SOURCES})
1540

16-
# Add this to the list of exported targets.
17-
set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS ${name})
18-
1941
# Determine where Swift modules will be built and installed.
2042
set(module_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
2143
set(module_base "${module_dir}/${name}.swiftmodule")
22-
set(module_file "${module_base}/${SWIFT_MODULE_TRIPLE}.swiftmodule")
23-
set(module_interface_file "${module_base}/${SWIFT_MODULE_TRIPLE}.swiftinterface")
24-
set(module_sourceinfo_file "${module_base}/${SWIFT_MODULE_TRIPLE}.swiftsourceinfo")
44+
set(module_file "${module_base}/${SWIFT_HOST_MODULE_TRIPLE}.swiftmodule")
45+
set(module_interface_file "${module_base}/${SWIFT_HOST_MODULE_TRIPLE}.swiftinterface")
46+
set(module_sourceinfo_file "${module_base}/${SWIFT_HOST_MODULE_TRIPLE}.swiftsourceinfo")
2547

2648
# Add a custom target to create the module directory.
2749
add_custom_command(
@@ -61,6 +83,12 @@ function(add_swift_host_library name)
6183
$<$<COMPILE_LANGUAGE:Swift>:-wmo>)
6284
endif()
6385

86+
if(LLVM_USE_LINKER)
87+
target_link_options(${name} PRIVATE
88+
"-use-ld=${LLVM_USE_LINKER}"
89+
)
90+
endif()
91+
6492
# NOTE: workaround for CMake not setting up include flags yet
6593
set_target_properties(${name} PROPERTIES
6694
INTERFACE_INCLUDE_DIRECTORIES ${module_dir}
@@ -70,18 +98,22 @@ function(add_swift_host_library name)
7098
BUILD_WITH_INSTALL_RPATH YES
7199
)
72100

73-
# Install this target
74-
install(TARGETS ${name}
75-
EXPORT SwiftSyntaxTargets
76-
ARCHIVE DESTINATION lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}
77-
LIBRARY DESTINATION lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}
78-
RUNTIME DESTINATION bin
79-
)
101+
if(PROJECT_IS_TOP_LEVEL)
102+
# Install this target
103+
install(TARGETS ${name}
104+
EXPORT SwiftSyntaxTargets
105+
ARCHIVE DESTINATION lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}
106+
LIBRARY DESTINATION lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}
107+
RUNTIME DESTINATION bin
108+
)
80109

81-
# Install the module files.
82-
install(
83-
DIRECTORY ${module_base}
84-
DESTINATION lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}
85-
FILES_MATCHING PATTERN "*.swiftinterface"
86-
)
110+
# Install the module files.
111+
install(
112+
DIRECTORY ${module_base}
113+
DESTINATION lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}
114+
FILES_MATCHING PATTERN "*.swiftinterface"
115+
)
116+
else()
117+
set_property(GLOBAL APPEND PROPERTY SWIFT_EXPORTS ${name})
118+
endif()
87119
endfunction()

‎cmake/modules/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)