Skip to content

Commit 21e3abe

Browse files
authored
[CMake] Fix up QuartzCore dependencies on macOS. (#4945)
CoreImage used to be part of QuartzCore on macOS, so QuartzCore automatically re-exports it.
1 parent 30f4de4 commit 21e3abe

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

stdlib/public/SDK/CoreImage/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ add_swift_library(swiftCoreImage ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK
44
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
55
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
66
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
7-
SWIFT_MODULE_DEPENDS Foundation ObjectiveC QuartzCore
7+
SWIFT_MODULE_DEPENDS Foundation ObjectiveC
88
SWIFT_MODULE_DEPENDS_IOS CoreMedia
99
SWIFT_MODULE_DEPENDS_TVOS CoreMedia
1010
FRAMEWORK_DEPENDS_OSX QuartzCore

stdlib/public/SDK/CoreImage/CoreImage.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
import Foundation
1414
@_exported import CoreImage // Clang module
1515

16-
#if os(OSX)
17-
import QuartzCore
18-
#endif
19-
2016
extension CIFilter {
2117
#if os(OSX)
2218
// - (CIImage *)apply:(CIKernel *)k, ...

stdlib/public/SDK/QuartzCore/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ add_swift_library(swiftQuartzCore ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SD
44
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
55
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
66
SWIFT_MODULE_DEPENDS ObjectiveC Foundation CoreGraphics
7+
SWIFT_MODULE_DEPENDS_OSX CoreImage
78
FRAMEWORK_DEPENDS QuartzCore)
89

910

0 commit comments

Comments
 (0)