Skip to content

Commit e096d1c

Browse files
author
Chris Bieneman
committed
[CMake] Simplify add_swift_library
This patch splits add_swift_library into two functions one which handles the simple case of adding a library that is part of the compiler being built and the second handling the more complicated case of "target" libraries, which may need to build for one or more targets. The new add_swift_library is built using llvm_add_library, which re-uses LLVM's CMake modules. In adapting to use LLVM's modules some of add_swift_library's named parameters have been removed and LINK_LIBRARIES has changed to LINK_LIBS, and LLVM_LINK_COMPONENTS changed to LINK_COMPONENTS. This patch also cleans up libswiftBasic's handling of UUID library and headers, and how it interfaces with gyb sources. add_swift_library also no longer has the FILE_DEPENDS parameter, which doesn't matter because llvm_add_library's DEPENDS parameter has the same behavior.
1 parent b1b9384 commit e096d1c

File tree

74 files changed

+397
-415
lines changed

Some content is hidden

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

74 files changed

+397
-415
lines changed

‎cmake/modules/AddSwift.cmake

Lines changed: 301 additions & 320 deletions
Large diffs are not rendered by default.

‎lib/AST/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,10 @@ add_swift_library(swiftAST STATIC
5555
TypeRepr.cpp
5656
TypeWalker.cpp
5757
USRGeneration.cpp
58-
LINK_LIBRARIES
58+
LINK_LIBS
5959
swiftMarkup
6060
swiftBasic
6161

62-
INTERFACE_LINK_LIBRARIES
6362
# Clang dependencies.
6463
# FIXME: Clang should really export these in some reasonable manner.
6564
clangCodeGen
@@ -81,7 +80,7 @@ add_swift_library(swiftAST STATIC
8180
clangAPINotes
8281
clangBasic
8382

84-
LLVM_COMPONENT_DEPENDS
83+
LINK_COMPONENTS
8584
bitreader bitwriter coroutines coverage irreader debuginfoDWARF
8685
profiledata instrumentation object objcarcopts mc mcparser
8786
bitreader bitwriter lto ipo option core support ${LLVM_TARGETS_TO_BUILD}

‎lib/ASTSectionImporter/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
add_swift_library(swiftASTSectionImporter STATIC
22
ASTSectionImporter.cpp
3-
LINK_LIBRARIES swiftBasic
4-
LLVM_COMPONENT_DEPENDS core)
3+
LINK_LIBS swiftBasic
4+
LINK_COMPONENTS core)
55

‎lib/Basic/CMakeLists.txt

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11

22
# On non-Darwin require UUID.
3-
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
4-
set(UUID_INCLUDE "")
5-
set(UUID_LIBRARIES "")
6-
elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
7-
set(UUID_INCLUDE "")
3+
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
84
set(UUID_LIBRARIES "ole32.lib")
9-
else()
5+
elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
106
find_package(UUID REQUIRED)
11-
set(UUID_INCLUDE "-I${UUID_INCLUDE_DIRS}")
7+
include_directories(AFTER ${UUID_INCLUDE_DIRS})
128
endif()
139

1410
# Figure out if we can track VC revisions.
@@ -64,6 +60,13 @@ generate_revision_inc(swift_revision_inc Swift "${SWIFT_SOURCE_DIR}")
6460
set(version_inc_files
6561
${llvm_revision_inc} ${clang_revision_inc} ${swift_revision_inc})
6662

63+
set(generated_include_sources UnicodeExtendedGraphemeClusters.cpp.gyb)
64+
65+
handle_gyb_sources(
66+
generated_include_targets
67+
generated_include_sources
68+
"")
69+
6770
add_swift_library(swiftBasic STATIC
6871
Cache.cpp
6972
ClusteredBitVector.cpp
@@ -106,11 +109,11 @@ add_swift_library(swiftBasic STATIC
106109
# Platform-agnostic fallback TaskQueue implementation
107110
Default/TaskQueue.inc
108111

109-
UnicodeExtendedGraphemeClusters.cpp.gyb
112+
${generated_include_sources}
110113

111-
C_COMPILE_FLAGS ${UUID_INCLUDE}
112-
LINK_LIBRARIES ${UUID_LIBRARIES}
113-
LLVM_COMPONENT_DEPENDS support)
114+
LINK_LIBS ${UUID_LIBRARIES}
115+
LINK_COMPONENTS support
116+
DEPENDS ${generated_include_targets})
114117

115118
message(STATUS "Swift version: ${SWIFT_VERSION}")
116119
message(STATUS "Swift vendor: ${SWIFT_VENDOR}")

‎lib/ClangImporter/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ add_swift_library(swiftClangImporter STATIC
2020
ImportName.cpp
2121
ImportType.cpp
2222
SwiftLookupTable.cpp
23-
LINK_LIBRARIES
23+
LINK_LIBS
2424
swiftAST
2525
swiftParse
2626
)

‎lib/Driver/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(swiftDriver_targetDefines)
1717
add_swift_library(swiftDriver STATIC
1818
${swiftDriver_sources}
1919
DEPENDS SwiftOptions
20-
LINK_LIBRARIES swiftAST swiftBasic swiftFrontend swiftOption)
20+
LINK_LIBS swiftAST swiftBasic swiftFrontend swiftOption)
2121

2222
# Generate the static-stdlib-args.lnk file used by -static-stdlib option
2323
# for 'GenericUnix' (eg linux)

‎lib/Frontend/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ add_swift_library(swiftFrontend STATIC
1313
SerializedDiagnosticConsumer.cpp
1414
${AppleHostVersionDetection}
1515
DEPENDS SwiftOptions
16-
LINK_LIBRARIES
16+
LINK_LIBS
1717
swiftSIL
1818
swiftOption
1919
swiftParse

‎lib/FrontendTool/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ add_swift_library(swiftFrontendTool STATIC
22
FrontendTool.cpp
33
ReferenceDependencies.cpp
44
DEPENDS SwiftOptions
5-
LINK_LIBRARIES
5+
LINK_LIBS
66
swiftIDE
77
swiftIRGen swiftSIL swiftSILGen swiftSILOptimizer
88
swiftImmediate

‎lib/IDE/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ add_swift_library(swiftIDE STATIC
99
SwiftSourceDocInfo.cpp
1010
SyntaxModel.cpp
1111
Utils.cpp
12-
LINK_LIBRARIES
12+
LINK_LIBS
1313
swiftFrontend
1414
swiftClangImporter
1515
swiftParse

‎lib/IRGen/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ add_swift_library(swiftIRGen STATIC
4141
StructLayout.cpp
4242
SwiftTargetInfo.cpp
4343
TypeLayoutVerifier.cpp
44-
LINK_LIBRARIES
44+
LINK_LIBS
4545
swiftAST
4646
swiftLLVMPasses
4747
swiftSIL

‎lib/Immediate/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
add_swift_library(swiftImmediate STATIC
22
Immediate.cpp
33
REPL.cpp
4-
LINK_LIBRARIES
4+
LINK_LIBS
55
swiftIDE
66
swiftFrontend
77
swiftSILGen
88
swiftSILOptimizer
99
swiftIRGen
10-
LLVM_COMPONENT_DEPENDS
10+
LINK_COMPONENTS
1111
linker mcjit)
1212

‎lib/Index/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ add_swift_library(swiftIndex STATIC
22
Index.cpp
33
IndexDataConsumer.cpp
44
IndexSymbol.cpp
5-
LINK_LIBRARIES
5+
LINK_LIBS
66
swiftAST)

‎lib/LLVMPasses/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ add_swift_library(swiftLLVMPasses STATIC
66
LLVMInlineTree.cpp
77
LLVMMergeFunctions.cpp
88

9-
LLVM_COMPONENT_DEPENDS
9+
LINK_COMPONENTS
1010
analysis
1111
)
1212

‎lib/Markup/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ add_swift_library(swiftMarkup STATIC
33
LineList.cpp
44
Markup.cpp
55

6-
LINK_LIBRARIES
6+
LINK_LIBS
77
libcmark_static)
88

‎lib/Option/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ add_swift_library(swiftOption STATIC
22
Options.cpp
33
SanitizerOptions.cpp
44
DEPENDS SwiftOptions
5-
LINK_LIBRARIES swiftBasic
6-
FILE_DEPENDS SwiftOptions)
5+
LINK_LIBS swiftBasic)
76

‎lib/Parse/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ add_swift_library(swiftParse STATIC
1010
ParseType.cpp
1111
PersistentParserState.cpp
1212
Scope.cpp
13-
LINK_LIBRARIES
13+
LINK_LIBS
1414
swiftSIL
1515
swiftAST
1616
)

‎lib/PrintAsObjC/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
add_swift_library(swiftPrintAsObjC STATIC
22
PrintAsObjC.cpp
33

4-
LINK_LIBRARIES
4+
LINK_LIBS
55
swiftIDE
66
swiftFrontend
77
swiftClangImporter

‎lib/RemoteAST/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
add_swift_library(swiftRemoteAST STATIC
22
RemoteAST.cpp
33
InProcessMemoryReader.cpp
4-
LINK_LIBRARIES
4+
LINK_LIBS
55
swiftSema swiftIRGen)

‎lib/SIL/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ add_swift_library(swiftSIL STATIC
3333
SILVTable.cpp
3434
SILWitnessTable.cpp
3535
TypeLowering.cpp
36-
LINK_LIBRARIES
36+
LINK_LIBS
3737
swiftSerialization
3838
swiftSema
3939
)

‎lib/SILGen/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ add_swift_library(swiftSILGen STATIC
2828
SILGenProlog.cpp
2929
SILGenStmt.cpp
3030
SILGenType.cpp
31-
LINK_LIBRARIES
31+
LINK_LIBS
3232
swiftSIL
3333
)

‎lib/SILOptimizer/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ add_swift_library(swiftSILOptimizer STATIC
1919
${MANDATORY_SOURCES}
2020
${TRANSFORMS_SOURCES}
2121
${IPO_SOURCES}
22-
LINK_LIBRARIES swiftSIL)
22+
LINK_LIBS swiftSIL)

‎lib/Sema/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ add_swift_library(swiftSema STATIC
4747
TypeCheckStmt.cpp
4848
TypeCheckType.cpp
4949
TypeChecker.cpp
50-
LINK_LIBRARIES
50+
LINK_LIBS
5151
swiftParse
5252
swiftAST
5353
${EXTRA_TYPECHECKER_FLAGS}

‎lib/Serialization/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ add_swift_library(swiftSerialization STATIC
66
SerializedModuleLoader.cpp
77
SerializedSILLoader.cpp
88
SerializeSIL.cpp
9-
LINK_LIBRARIES
9+
LINK_LIBS
1010
swiftClangImporter)
1111

‎lib/SwiftDemangle/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
add_swift_library(swiftDemangle SHARED
22
SwiftDemangle.cpp
33
MangleHack.cpp
4-
LINK_LIBRARIES swiftBasic)
4+
LINK_LIBS swiftBasic)
55

66
swift_install_in_component(compiler
77
TARGETS swiftDemangle

‎stdlib/internal/SwiftExperimental/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftSwiftExperimental ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
1+
add_swift_target_library(swiftSwiftExperimental ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
22
# This file should be listed the first. Module name is inferred from the
33
# filename.
44
SwiftExperimental.swift

‎stdlib/private/StdlibCollectionUnittest/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ endif()
55

66
# TODO: support this on non-POSIX platforms. It cannot be currently as it
77
# depends on pthreads.
8-
add_swift_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
8+
add_swift_target_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
99
# This file should be listed the first. Module name is inferred from the
1010
# filename.
1111
StdlibCollectionUnittest.swift

‎stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ endif()
55

66
# TODO: support this on non-POSIX platforms. It cannot be currently as it
77
# depends on pthreads.
8-
add_swift_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
8+
add_swift_target_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
99
# This file should be listed the first. Module name is inferred from the
1010
# filename.
1111
StdlibUnicodeUnittest.swift

‎stdlib/private/StdlibUnittest/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ endif()
1010

1111
# TODO: support this on non-POSIX platforms. It cannot be currently as it
1212
# depends on pthreads.
13-
add_swift_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
13+
add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
1414
# This file should be listed the first. Module name is inferred from the
1515
# filename.
1616
StdlibUnittest.swift.gyb

‎stdlib/private/StdlibUnittestFoundationExtras/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftStdlibUnittestFoundationExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
1+
add_swift_target_library(swiftStdlibUnittestFoundationExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
22
# This file should be listed the first. Module name is inferred from the
33
# filename.
44
StdlibUnittestFoundationExtras.swift

‎stdlib/private/SwiftPrivate/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
1+
add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
22
# This file should be listed the first. Module name is inferred from the
33
# filename.
44
SwiftPrivate.swift

‎stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
1+
add_swift_target_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
22
# This file should be listed the first. Module name is inferred from the
33
# filename.
44
SwiftPrivateLibcExtras.swift

‎stdlib/private/SwiftPrivatePthreadExtras/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftSwiftPrivatePthreadExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
1+
add_swift_target_library(swiftSwiftPrivatePthreadExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
22
# This file should be listed the first. Module name is inferred from the
33
# filename.
44
SwiftPrivatePthreadExtras.swift

‎stdlib/private/SwiftReflectionTest/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
if (SWIFT_INCLUDE_TESTS)
3-
add_swift_library(swiftSwiftReflectionTest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
3+
add_swift_target_library(swiftSwiftReflectionTest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
44
SwiftReflectionTest.swift
55
SWIFT_MODULE_DEPENDS Darwin
66
TARGET_SDKS ALL_APPLE_PLATFORMS

‎stdlib/public/Platform/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(swift_platform_sources
66
TiocConstants.swift
77
tgmath.swift.gyb)
88

9-
add_swift_library(swiftDarwin ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
9+
add_swift_target_library(swiftDarwin ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
1010
Darwin.swift.gyb
1111
${swift_platform_sources}
1212
POSIXError.swift
@@ -17,7 +17,7 @@ add_swift_library(swiftDarwin ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
1717
TARGET_SDKS ALL_APPLE_PLATFORMS
1818
API_NOTES_NON_OVERLAY)
1919

20-
add_swift_library(swiftGlibc ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
20+
add_swift_target_library(swiftGlibc ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
2121
Glibc.swift.gyb
2222
${swift_platform_sources}
2323

@@ -26,7 +26,7 @@ add_swift_library(swiftGlibc ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
2626
TARGET_SDKS ANDROID CYGWIN FREEBSD LINUX
2727
DEPENDS glibc_modulemap)
2828

29-
add_swift_library(swiftMSVCRT ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
29+
add_swift_target_library(swiftMSVCRT ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
3030
msvcrt.swift
3131
${swift_platform_sources}
3232

‎stdlib/public/Reflection/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftReflection STATIC TARGET_LIBRARY FORCE_BUILD_FOR_HOST_SDK
1+
add_swift_target_library(swiftReflection STATIC TARGET_LIBRARY FORCE_BUILD_FOR_HOST_SDK
22
Demangle.cpp
33
MetadataSource.cpp
44
Remangle.cpp

‎stdlib/public/SDK/AVFoundation/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftAVFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
1+
add_swift_target_library(swiftAVFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
AVError.swift
33
NSValue.swift.gyb
44

‎stdlib/public/SDK/AppKit/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftAppKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
1+
add_swift_target_library(swiftAppKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
AppKit.swift
33
AppKit_FoundationExtensions.swift
44
NSError.swift

‎stdlib/public/SDK/AssetsLibrary/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftAssetsLibrary ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
1+
add_swift_target_library(swiftAssetsLibrary ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
ALAssetsLibrary.swift
33
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
44
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

‎stdlib/public/SDK/CallKit/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftCallKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
1+
add_swift_target_library(swiftCallKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
CXProviderConfiguration.swift
33

44
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"

‎stdlib/public/SDK/CloudKit/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftCloudKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
1+
add_swift_target_library(swiftCloudKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
CKError.swift
33

44
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"

‎stdlib/public/SDK/Contacts/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftContacts ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
1+
add_swift_target_library(swiftContacts ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
CNError.swift
33

44
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"

‎stdlib/public/SDK/CoreAudio/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftCoreAudio ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
1+
add_swift_target_library(swiftCoreAudio ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
CoreAudio.swift
33
../../../public/core/WriteBackMutableSlice.swift
44

‎stdlib/public/SDK/CoreData/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftCoreData ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
1+
add_swift_target_library(swiftCoreData ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
CocoaError.swift
33
NSManagedObjectContext.swift
44
CoreData.mm

0 commit comments

Comments
 (0)