Merge pull request #4964 from jckarter/dependencies-3.0

tkremenek · web-flow · commit 487c5daf1fd0 · 2016-09-23T16:55:01.000-07:00
[3.0] Dependency fixes for overlays
diff --git a/stdlib/public/SDK/AppKit/CMakeLists.txt b/stdlib/public/SDK/AppKit/CMakeLists.txt
@@ -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)
 
diff --git a/stdlib/public/SDK/CoreImage/CMakeLists.txt b/stdlib/public/SDK/CoreImage/CMakeLists.txt
@@ -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
diff --git a/stdlib/public/SDK/CoreImage/CoreImage.swift b/stdlib/public/SDK/CoreImage/CoreImage.swift
@@ -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, ...
diff --git a/stdlib/public/SDK/MapKit/CMakeLists.txt b/stdlib/public/SDK/MapKit/CMakeLists.txt
@@ -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)
 
diff --git a/stdlib/public/SDK/QuartzCore/CMakeLists.txt b/stdlib/public/SDK/QuartzCore/CMakeLists.txt
@@ -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)
 
 
diff --git a/stdlib/public/SDK/UIKit/CMakeLists.txt b/stdlib/public/SDK/UIKit/CMakeLists.txt
@@ -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)
 
diff --git a/stdlib/public/SDK/WatchKit/CMakeLists.txt b/stdlib/public/SDK/WatchKit/CMakeLists.txt
@@ -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
