Skip to content

Commit e7daf01

Browse files
ktosoktoso
authored
Merge branch 'main' into task-names-update
2 parents a512765 + 7ff1066 commit e7daf01

File tree

415 files changed

+5974
-2347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

415 files changed

+5974
-2347
lines changed

‎.github/CODEOWNERS

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,28 @@
88

99
# TODO: /.clang-format
1010

11-
/.clang-tidy @egorzhdan
11+
/.clang-tidy @egorzhdan
1212

13-
# TODO: /.dir-locals.el
13+
/.dir-locals.el @al45tair
14+
/.editorconfig @hamishknight
1415
# TODO: /.flake8
15-
# TODO: /.gitattributes
16+
/.gitattributes @shahmishal
1617

1718
# .github
1819
/.github/ @shahmishal
1920
/.github/CODEOWNERS @AnthonyLatsis @shahmishal
20-
/.github/ISSUE_TEMPLATE/ @AnthonyLatsis @hborla @LucianoPAlmeida @shahmishal @xedin
21-
/.github/PULL_REQUEST_TEMPLATE.md @AnthonyLatsis @hborla @LucianoPAlmeida @shahmishal @xedin
21+
/.github/ISSUE_TEMPLATE/ @AnthonyLatsis @hborla @shahmishal @xedin
22+
/.github/PULL_REQUEST_TEMPLATE.md @AnthonyLatsis @hborla @shahmishal @xedin
2223

23-
# TODO: /.gitignore
24+
/.gitignore @shahmishal
2425
# TODO: /.mailmap
2526
# TODO: /Brewfile
26-
# TODO: /CHANGELOG.md
27+
/CHANGELOG.md @hborla
2728
# TODO: /CMakeLists.txt
28-
# TODO: /CODE_OF_CONDUCT.md
29-
# TODO: /CODE_OWNERS.TXT
30-
# TODO: /CONTRIBUTING.md
31-
# TODO: /LICENSE.txt
29+
/CODE_OF_CONDUCT.md @swiftlang/core-team
30+
/CODE_OWNERS.TXT @swiftlang/core-team
31+
/CONTRIBUTING.md @AnthonyLatsis @xedin
32+
/LICENSE.txt @swiftlang/core-team
3233
# TODO: /README.md
3334

3435
# Runtimes
@@ -60,7 +61,7 @@
6061
/docs/ABI/RegisterUsage.md @al45tair
6162
/docs/CrossCompilationModel.md @MaxDesiatov
6263
/docs/Generics @slavapestov
63-
/docs/HowToGuides/ @AnthonyLatsis @LucianoPAlmeida @xedin
64+
/docs/HowToGuides/ @AnthonyLatsis @xedin
6465
/docs/Optimizer* @eeckstein
6566
/docs/SIL* @jckarter
6667
/docs/Windows* @compnerd

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
| | **Architecture** | **Build** |
1010
|---|:---:|:---:|
11-
| **macOS** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-macos/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-macos)|
11+
| **macOS** | Universal |[![Build Status](https://ci.swift.org/job/oss-swift-package-macos/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-macos)|
1212
| **Ubuntu 20.04** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04)|
1313
| **Ubuntu 20.04** | AArch64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04-aarch64/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04-aarch64)|
1414
| **Ubuntu 22.04** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04)|

‎Runtimes/Core/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ include(AvailabilityMacros)
8282
include(CompilerSettings)
8383
include(DefaultSettings)
8484
include(EmitSwiftInterface)
85+
include(InstallSwiftInterface)
8586
include(PlatformInfo)
8687
include(gyb)
8788
include(ResourceEmbedding)

‎Runtimes/Core/Concurrency/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ add_subdirectory(InternalShims)
22

33
gyb_expand(Task+init.swift.gyb Task+init.swift)
44
gyb_expand(TaskGroup+addTask.swift.gyb TaskGroup+addTask.swift)
5-
gyb_expand(Task+startSynchronously.swift.gyb Task+startSynchronously.swift)
5+
gyb_expand(Task+immediate.swift.gyb Task+immediate.swift)
66

77
add_library(swift_Concurrency
88
Actor.cpp
@@ -98,7 +98,7 @@ add_library(swift_Concurrency
9898
TaskSleepDuration.swift
9999
"${CMAKE_CURRENT_BINARY_DIR}/Task+init.swift"
100100
"${CMAKE_CURRENT_BINARY_DIR}/TaskGroup+addTask.swift"
101-
"${CMAKE_CURRENT_BINARY_DIR}/Task+startSynchronously.swift")
101+
"${CMAKE_CURRENT_BINARY_DIR}/Task+immediate.swift")
102102

103103
include(${SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR}.cmake)
104104
target_compile_definitions(swift_Concurrency PRIVATE

‎Runtimes/Core/cmake/modules/EmitSwiftInterface.cmake

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -31,43 +31,3 @@ function(emit_swift_interface target)
3131
endif()
3232
endif()
3333
endfunction()
34-
35-
# Install the generated swift interface file for the target if library evolution
36-
# is enabled.
37-
function(install_swift_interface target)
38-
# Install binary swift modules
39-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
40-
RENAME "${SwiftCore_MODULE_TRIPLE}.swiftmodule"
41-
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
42-
COMPONENT SwiftCore_development)
43-
if(SwiftCore_VARIANT_MODULE_TRIPLE)
44-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.swiftmodule"
45-
RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftmodule"
46-
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
47-
COMPONENT SwiftCore_development)
48-
endif()
49-
50-
# Install Swift interfaces if library-evolution is enabled
51-
if(SwiftCore_ENABLE_LIBRARY_EVOLUTION)
52-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftinterface"
53-
RENAME "${SwiftCore_MODULE_TRIPLE}.swiftinterface"
54-
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
55-
COMPONENT SwiftCore_development)
56-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.private.swiftinterface"
57-
RENAME "${SwiftCore_MODULE_TRIPLE}.private.swiftinterface"
58-
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
59-
COMPONENT SwiftCore_development)
60-
61-
# Install catalyst interface files
62-
if(SwiftCore_VARIANT_MODULE_TRIPLE)
63-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.swiftinterface"
64-
RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftinterface"
65-
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
66-
COMPONENT SwiftCore_development)
67-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.private.swiftinterface"
68-
RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.private.swiftinterface"
69-
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
70-
COMPONENT SwiftCore_development)
71-
endif()
72-
endif()
73-
endfunction()

‎Runtimes/Core/cmake/modules/ExperimentalFeatures.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ add_compile_options(
44
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature SE427NoInferenceOnExtension>"
55
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature NonescapableTypes>"
66
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature LifetimeDependence>"
7+
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature LifetimeDependenceMutableAccessors>"
78
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature MemberImportVisibility>"
89
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature TypedThrows>"
910
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature Macros>"

‎Runtimes/Core/cmake/modules/InstallSwiftInterface.cmake

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
2+
# Install the generated swift interface files for the target.
3+
function(install_swift_interface target)
4+
# Install binary swift modules
5+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
6+
RENAME "${SwiftCore_MODULE_TRIPLE}.swiftmodule"
7+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
8+
COMPONENT SwiftCore_development)
9+
if(SwiftCore_VARIANT_MODULE_TRIPLE)
10+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.swiftmodule"
11+
RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftmodule"
12+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
13+
COMPONENT SwiftCore_development)
14+
endif()
15+
16+
# Install Swift interfaces if library-evolution is enabled
17+
if(SwiftCore_ENABLE_LIBRARY_EVOLUTION)
18+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftinterface"
19+
RENAME "${SwiftCore_MODULE_TRIPLE}.swiftinterface"
20+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
21+
COMPONENT SwiftCore_development)
22+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.private.swiftinterface"
23+
RENAME "${SwiftCore_MODULE_TRIPLE}.private.swiftinterface"
24+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
25+
COMPONENT SwiftCore_development)
26+
27+
# Install catalyst interface files
28+
if(SwiftCore_VARIANT_MODULE_TRIPLE)
29+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.swiftinterface"
30+
RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftinterface"
31+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
32+
COMPONENT SwiftCore_development)
33+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.private.swiftinterface"
34+
RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.private.swiftinterface"
35+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
36+
COMPONENT SwiftCore_development)
37+
endif()
38+
endif()
39+
40+
# Install Swift documentation interface files.
41+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftdoc"
42+
RENAME "${SwiftCore_MODULE_TRIPLE}.swiftdoc"
43+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
44+
COMPONENT SwiftCore_development)
45+
if(SwiftCore_VARIANT_MODULE_TRIPLE)
46+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.swiftdoc"
47+
RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftdoc"
48+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
49+
COMPONENT SwiftCore_development)
50+
endif()
51+
endfunction()

‎Runtimes/Overlay/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN YES)
77

88
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
99

10+
if(POLICY CMP0157 AND CMAKE_Swift_COMPILER_USE_OLD_DRIVER)
11+
cmake_policy(SET CMP0157 OLD)
12+
endif()
13+
1014
# NOTE: always use the 3-component style as the expansion as
1115
# `${PROJECT_VERSION}` will not extend this to the complete form and this can
1216
# change the behaviour for comparison with non-SemVer compliant parsing. If
@@ -36,6 +40,7 @@ include(gyb)
3640
include(AvailabilityMacros)
3741
include(DefaultSettings)
3842
include(EmitSwiftInterface)
43+
include(InstallSwiftInterface)
3944
include(PlatformInfo)
4045
include(ResourceEmbedding)
4146

‎Runtimes/Overlay/cmake/modules/DefaultSettings.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "WASM")
3131
elseif(LINUX OR ANDROID OR BSD)
3232
set(SwiftOverlay_ENABLE_REFLECTION_default OFF)
3333
elseif(WIN32)
34-
set(SwiftOverlay_ENABLE_REFLECTION_default OFF)
34+
set(SwiftOverlay_ENABLE_REFLECTION_default ON)
3535
endif()
3636

3737
include("${SwiftOverlay_VENDOR_MODULE_DIR}/DefaultSettings.cmake" OPTIONAL)

‎Runtimes/Overlay/cmake/modules/EmitSwiftInterface.cmake

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -31,38 +31,3 @@ function(emit_swift_interface target)
3131
endif()
3232
endif()
3333
endfunction()
34-
35-
# Install the generated swift interface file for the target if library evolution
36-
# is enabled.
37-
function(install_swift_interface target)
38-
# Install binary swift modules
39-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
40-
RENAME "${SwiftOverlay_MODULE_TRIPLE}.swiftmodule"
41-
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
42-
if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
43-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.swiftmodule"
44-
RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftmodule"
45-
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
46-
endif()
47-
48-
# Install Swift interfaces if library-evolution is enabled
49-
if(SwiftOverlay_ENABLE_LIBRARY_EVOLUTION)
50-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftinterface"
51-
RENAME "${SwiftOverlay_MODULE_TRIPLE}.swiftinterface"
52-
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
53-
54-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.private.swiftinterface"
55-
RENAME "${SwiftOverlay_MODULE_TRIPLE}.private.swiftinterface"
56-
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
57-
58-
# Install catalyst interface files
59-
if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
60-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.swiftinterface"
61-
RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftinterface"
62-
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
63-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.private.swiftinterface"
64-
RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.private.swiftinterface"
65-
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
66-
endif()
67-
endif()
68-
endfunction()

‎Runtimes/Overlay/cmake/modules/InstallSwiftInterface.cmake

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
2+
# Install the generated swift interface files for the target.
3+
function(install_swift_interface target)
4+
# Install binary swift modules
5+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
6+
RENAME "${SwiftOverlay_MODULE_TRIPLE}.swiftmodule"
7+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
8+
if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
9+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.swiftmodule"
10+
RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftmodule"
11+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
12+
endif()
13+
14+
# Install Swift interfaces if library-evolution is enabled
15+
if(SwiftOverlay_ENABLE_LIBRARY_EVOLUTION)
16+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftinterface"
17+
RENAME "${SwiftOverlay_MODULE_TRIPLE}.swiftinterface"
18+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
19+
20+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.private.swiftinterface"
21+
RENAME "${SwiftOverlay_MODULE_TRIPLE}.private.swiftinterface"
22+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
23+
24+
# Install catalyst interface files
25+
if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
26+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.swiftinterface"
27+
RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftinterface"
28+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
29+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.private.swiftinterface"
30+
RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.private.swiftinterface"
31+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
32+
endif()
33+
endif()
34+
35+
# Install Swift documentation interface files.
36+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftdoc"
37+
RENAME "${SwiftOverlay_MODULE_TRIPLE}.swiftdoc"
38+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
39+
COMPONENT SwiftOverlay_development)
40+
if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
41+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.swiftdoc"
42+
RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftdoc"
43+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
44+
COMPONENT SwiftOverlay_development)
45+
endif()
46+
endfunction()

‎Runtimes/Supplemental/StringProcessing/CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ set(CMAKE_POSITION_INDEPENDENT_CODE YES)
44

55
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake/modules")
66

7+
if(POLICY CMP0157 AND CMAKE_Swift_COMPILER_USE_OLD_DRIVER)
8+
cmake_policy(SET CMP0157 OLD)
9+
endif()
10+
711
if($ENV{BUILD_NUMBER})
812
math(EXPR BUILD_NUMBER "$ENV{BUILD_NUMBER} % 65535")
913
set(BUILD_NUMBER ".${BUILD_NUMBER}")
@@ -22,7 +26,17 @@ set(${PROJECT_NAME}_SWIFTC_SOURCE_DIR
2226

2327
find_package(SwiftCore)
2428

29+
include(GNUInstallDirs)
30+
2531
include(AvailabilityMacros)
32+
include(EmitSwiftInterface)
33+
include(InstallSwiftInterface)
34+
include(PlatformInfo)
35+
include(ResourceEmbedding)
36+
37+
option(${PROJECT_NAME}_INSTALL_NESTED_SUBDIR "Install libraries under a platform and architecture subdirectory" ON)
38+
set(${PROJECT_NAME}_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>$<$<BOOL:${PROJECT_NAME}_INSTALL_NESTED_SUBDIR>:/${${PROJECT_NAME}_PLATFORM_SUBDIR}/${${PROJECT_NAME}_ARCH_SUBDIR}>")
39+
set(${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>$<$<BOOL:${PROJECT_NAME}_INSTALL_NESTED_SUBDIR>:/${${PROJECT_NAME}_PLATFORM_SUBDIR}>")
2640

2741
add_compile_options(
2842
$<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>

‎Runtimes/Supplemental/StringProcessing/RegexBuilder/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,12 @@ target_link_libraries(swiftRegexBuilder PRIVATE
1313
swift_RegexParser
1414
swift_StringProcessing
1515
swiftCore)
16+
17+
install(TARGETS swiftRegexBuilder
18+
ARCHIVE DESTINATION "${SwiftStringProcessing_INSTALL_LIBDIR}"
19+
LIBRARY DESTINATION "${SwiftStringProcessing_INSTALL_LIBDIR}"
20+
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
21+
emit_swift_interface(swiftRegexBuilder)
22+
install_swift_interface(swiftRegexBuilder)
23+
24+
embed_manifest(swiftRegexBuilder)

‎Runtimes/Supplemental/StringProcessing/_RegexParser/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,12 @@ target_link_libraries(swift_RegexParser PRIVATE swiftCore)
3535

3636
set_target_properties(swift_RegexParser PROPERTIES
3737
Swift_MODULE_NAME _RegexParser)
38+
39+
install(TARGETS swift_RegexParser
40+
ARCHIVE DESTINATION "${SwiftStringProcessing_INSTALL_LIBDIR}"
41+
LIBRARY DESTINATION "${SwiftStringProcessing_INSTALL_LIBDIR}"
42+
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
43+
emit_swift_interface(swift_RegexParser)
44+
install_swift_interface(swift_RegexParser)
45+
46+
embed_manifest(swift_RegexParser)

‎Runtimes/Supplemental/StringProcessing/_StringProcessing/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,12 @@ set_target_properties(swift_StringProcessing PROPERTIES
7878
target_link_libraries(swift_StringProcessing PRIVATE
7979
swift_RegexParser
8080
swiftCore)
81+
82+
install(TARGETS swift_StringProcessing
83+
ARCHIVE DESTINATION "${SwiftStringProcessing_INSTALL_LIBDIR}"
84+
LIBRARY DESTINATION "${SwiftStringProcessing_INSTALL_LIBDIR}"
85+
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
86+
emit_swift_interface(swift_StringProcessing)
87+
install_swift_interface(swift_StringProcessing)
88+
89+
embed_manifest(swift_StringProcessing)

0 commit comments

Comments
 (0)