Make overlay dependencies explicit.

jrose-apple · jrose-apple · commit ff7c3f0c6af5 · 2015-06-17T04:47:58.000Z
-import-underlying-module deliberately avoids autolinking against that module,
since normally it's used when building the Swift half of a single binary.
For the overlays, however, that's not what we want, so add the underlying
framework explicitly.

Swift SVN r29439
diff --git a/stdlib/public/SDK/AVFoundation/CMakeLists.txt b/stdlib/public/SDK/AVFoundation/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_swift_library(swiftAVFoundation IS_SDK_OVERLAY
   AVFoundation.swift
   TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS Foundation CoreMedia)
+  SWIFT_MODULE_DEPENDS Foundation CoreMedia
+  FRAMEWORK_DEPENDS AVFoundation)
diff --git a/stdlib/public/SDK/CloudKit/CMakeLists.txt b/stdlib/public/SDK/CloudKit/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_swift_library(swiftCloudKit IS_SDK_OVERLAY
   CloudKit.swift
   TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS Foundation CoreLocation)
+  SWIFT_MODULE_DEPENDS Foundation CoreLocation
+  FRAMEWORK_DEPENDS CloudKit)
diff --git a/stdlib/public/SDK/CoreData/CMakeLists.txt b/stdlib/public/SDK/CoreData/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_swift_library(swiftCoreData IS_SDK_OVERLAY
   CoreData.swift
 
-  SWIFT_MODULE_DEPENDS Foundation)
+  SWIFT_MODULE_DEPENDS Foundation
+  FRAMEWORK_DEPENDS CoreData)
 
diff --git a/stdlib/public/SDK/CoreLocation/CMakeLists.txt b/stdlib/public/SDK/CoreLocation/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_swift_library(swiftCoreLocation IS_SDK_OVERLAY
   CoreLocation.swift
-  SWIFT_MODULE_DEPENDS Foundation)
+  SWIFT_MODULE_DEPENDS Foundation
+  FRAMEWORK_DEPENDS CoreLocation)
diff --git a/stdlib/public/SDK/EventKit/CMakeLists.txt b/stdlib/public/SDK/EventKit/CMakeLists.txt
@@ -3,4 +3,5 @@ add_swift_library(swiftEventKit IS_SDK_OVERLAY
 
   TARGET_SDKS OSX IOS IOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
   SWIFT_MODULE_DEPENDS Foundation CoreGraphics CoreLocation
-  SWIFT_MODULE_DEPENDS_OSX AppKit)
+  SWIFT_MODULE_DEPENDS_OSX AppKit
+  FRAMEWORK_DEPENDS EventKit)
diff --git a/stdlib/public/SDK/GameKit/CMakeLists.txt b/stdlib/public/SDK/GameKit/CMakeLists.txt
@@ -3,4 +3,5 @@ add_swift_library(swiftGameKit IS_SDK_OVERLAY
   TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
   SWIFT_MODULE_DEPENDS Foundation GameplayKit SpriteKit SceneKit
   SWIFT_MODULE_DEPENDS_OSX AppKit
-  SWIFT_MODULE_DEPENDS_IOS_TVOS UIKit)
+  SWIFT_MODULE_DEPENDS_IOS_TVOS UIKit
+  FRAMEWORK_DEPENDS GameKit)
diff --git a/stdlib/public/SDK/HomeKit/CMakeLists.txt b/stdlib/public/SDK/HomeKit/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_swift_library(swiftHomeKit IS_SDK_OVERLAY
   HomeKit.swift
   TARGET_SDKS IOS IOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS Foundation)
+  SWIFT_MODULE_DEPENDS Foundation
+  FRAMEWORK_DEPENDS HomeKit)
diff --git a/stdlib/public/SDK/LocalAuthentication/CMakeLists.txt b/stdlib/public/SDK/LocalAuthentication/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_swift_library(swiftLocalAuthentication IS_SDK_OVERLAY
   LocalAuthentication.swift
   TARGET_SDKS OSX IOS IOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS Foundation)
+  SWIFT_MODULE_DEPENDS Foundation
+  FRAMEWORK_DEPENDS LocalAuthentication)
diff --git a/stdlib/public/SDK/MultipeerConnectivity/CMakeLists.txt b/stdlib/public/SDK/MultipeerConnectivity/CMakeLists.txt
@@ -4,4 +4,5 @@ add_swift_library(swiftMultipeerConnectivity IS_SDK_OVERLAY
   TARGET_SDKS OSX IOS IOS_SIMULATOR
   SWIFT_MODULE_DEPENDS Foundation
   SWIFT_MODULE_DEPENDS_OSX AppKit
-  SWIFT_MODULE_DEPENDS_IOS_TVOS UIKit)
+  SWIFT_MODULE_DEPENDS_IOS_TVOS UIKit
+  FRAMEWORK_DEPENDS MultipeerConnectivity)
diff --git a/stdlib/public/SDK/PassKit/CMakeLists.txt b/stdlib/public/SDK/PassKit/CMakeLists.txt
@@ -3,4 +3,5 @@ add_swift_library(swiftPassKit IS_SDK_OVERLAY
   TARGET_SDKS IOS IOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
   SWIFT_MODULE_DEPENDS Foundation UIKit
   SWIFT_COMPILE_FLAGS_WATCHOS -Xfrontend -disable-autolink-framework -Xfrontend CoreText
+  FRAMEWORK_DEPENDS PassKit
 )
diff --git a/stdlib/public/SDK/WatchConnectivity/CMakeLists.txt b/stdlib/public/SDK/WatchConnectivity/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_swift_library(swiftWatchConnectivity IS_SDK_OVERLAY
   WatchConnectivity.swift
   TARGET_SDKS IOS IOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS Foundation)
+  SWIFT_MODULE_DEPENDS Foundation
+  FRAMEWORK_DEPENDS WatchConnectivity)

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,5 @@ add_swift_library(swiftPassKit IS_SDK_OVERLAY`
`3`	`3`	`TARGET_SDKS IOS IOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR`
`4`	`4`	`SWIFT_MODULE_DEPENDS Foundation UIKit`
`5`	`5`	`SWIFT_COMPILE_FLAGS_WATCHOS -Xfrontend -disable-autolink-framework -Xfrontend CoreText`
	`6`	`+ FRAMEWORK_DEPENDS PassKit`
`6`	`7`	`)`