Skip to content

[3.0] Dependency fixes for overlays #4964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 23, 2016
Merged

[3.0] Dependency fixes for overlays #4964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf846bf
Attempt to tighten up dependencies for new MapKit and QuartzCore over…
jckarter Sep 22, 2016
42113b6
[CMake] Fix up QuartzCore dependencies on macOS. (#4945)
jrose-apple Sep 23, 2016
a038669
[CMake] More dependency updates. (#4962)
jrose-apple Sep 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stdlib/public/SDK/AppKit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ add_swift_library(swiftAppKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OV
AppKit_FoundationExtensions.swift
NSError.swift
TARGET_SDKS OSX
SWIFT_MODULE_DEPENDS ObjectiveC Foundation CoreData CoreImage
SWIFT_MODULE_DEPENDS ObjectiveC Foundation CoreData CoreImage QuartzCore
FRAMEWORK_DEPENDS AppKit)

2 changes: 1 addition & 1 deletion stdlib/public/SDK/CoreImage/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ add_swift_library(swiftCoreImage ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK
CoreImage.swift

TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
SWIFT_MODULE_DEPENDS Foundation ObjectiveC QuartzCore
SWIFT_MODULE_DEPENDS Foundation ObjectiveC
SWIFT_MODULE_DEPENDS_IOS CoreMedia
SWIFT_MODULE_DEPENDS_TVOS CoreMedia
FRAMEWORK_DEPENDS_OSX QuartzCore
Expand Down
4 changes: 0 additions & 4 deletions stdlib/public/SDK/CoreImage/CoreImage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
import Foundation
@_exported import CoreImage // Clang module

#if os(OSX)
import QuartzCore
#endif

extension CIFilter {
#if os(OSX)
// - (CIImage *)apply:(CIKernel *)k, ...
Expand Down
8 changes: 4 additions & 4 deletions stdlib/public/SDK/MapKit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ add_swift_library(swiftMapKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OV
MapKit.swift.gyb
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
SWIFT_MODULE_DEPENDS ObjectiveC Foundation
SWIFT_MODULE_DEPENDS_IOS QuartzCore
SWIFT_MODULE_DEPENDS_OSX QuartzCore AppKit
SWIFT_MODULE_DEPENDS_TVOS QuartzCore
SWIFT_MODULE_DEPENDS ObjectiveC Foundation CoreLocation
SWIFT_MODULE_DEPENDS_IOS QuartzCore CoreImage UIKit
SWIFT_MODULE_DEPENDS_OSX QuartzCore CoreImage AppKit
SWIFT_MODULE_DEPENDS_TVOS QuartzCore CoreImage UIKit
FRAMEWORK_DEPENDS MapKit)

3 changes: 2 additions & 1 deletion stdlib/public/SDK/QuartzCore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ add_swift_library(swiftQuartzCore ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SD
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
SWIFT_MODULE_DEPENDS ObjectiveC Foundation
SWIFT_MODULE_DEPENDS ObjectiveC Foundation CoreGraphics
SWIFT_MODULE_DEPENDS_OSX CoreImage
FRAMEWORK_DEPENDS QuartzCore)


4 changes: 2 additions & 2 deletions stdlib/public/SDK/UIKit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ add_swift_library(swiftUIKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVE
UIKit_FoundationExtensions.swift.gyb
TARGET_SDKS IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
SWIFT_MODULE_DEPENDS ObjectiveC Foundation
SWIFT_MODULE_DEPENDS_IOS CoreImage
SWIFT_MODULE_DEPENDS_TVOS CoreImage
SWIFT_MODULE_DEPENDS_IOS CoreImage QuartzCore
SWIFT_MODULE_DEPENDS_TVOS CoreImage QuartzCore
SWIFT_COMPILE_FLAGS_WATCHOS -Xfrontend -disable-autolink-framework -Xfrontend CoreText
FRAMEWORK_DEPENDS UIKit)

2 changes: 1 addition & 1 deletion stdlib/public/SDK/WatchKit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
add_swift_library(swiftWatchKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
WatchKit.swift
TARGET_SDKS IOS IOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
SWIFT_MODULE_DEPENDS Foundation UIKit CoreGraphics
SWIFT_MODULE_DEPENDS Foundation UIKit CoreGraphics MapKit
SWIFT_MODULE_DEPENDS_WATCHOS HomeKit SceneKit
FRAMEWORK_DEPENDS_WEAK WatchKit
SWIFT_COMPILE_FLAGS_WATCHOS -Xfrontend -disable-autolink-framework -Xfrontend CoreText
Expand Down