averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

CMake: add Observation dependency to libraries that import Foundation...

Browse Source 
when building for Apple platforms.

In this scenario we are not building our own Foundation,
but we are importing the one from the underlying SDK -- this in turns
requires Observation, which is something we typically build.

Addresses rdar://162286123
This commit is contained in:
Eric Miotto
2025-10-16 10:27:35 -07:00
parent 1ae8ef0004
commit 7239481fef
3 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt
View File

@@ -1,5 +1,11 @@
set(swift_stdlib_unittest_compile_flags)
if(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION)
# This library imports Foundation from the SDK, which re-exports
# Observation which is part of this build.
list(APPEND swift_stdlib_unicode_unittest_darwin_dependencies Observation)
endif()
add_swift_target_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
# This file should be listed the first. Module name is inferred from the
# filename.
@@ -10,6 +16,12 @@ add_swift_target_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD
WordBreaking.swift
SWIFT_MODULE_DEPENDS StdlibUnittest
SWIFT_MODULE_DEPENDS_IOS ${swift_stdlib_unicode_unittest_darwin_dependencies}
SWIFT_MODULE_DEPENDS_OSX ${swift_stdlib_unicode_unittest_darwin_dependencies}
SWIFT_MODULE_DEPENDS_TVOS ${swift_stdlib_unicode_unittest_darwin_dependencies}
SWIFT_MODULE_DEPENDS_WATCHOS ${swift_stdlib_unicode_unittest_darwin_dependencies}
SWIFT_MODULE_DEPENDS_XROS ${swift_stdlib_unicode_unittest_darwin_dependencies}
SWIFT_MODULE_DEPENDS_MACCATALYST ${swift_stdlib_unicode_unittest_darwin_dependencies}
SWIFT_MODULE_DEPENDS_ANDROID Android
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl

6
stdlib/private/StdlibUnittest/CMakeLists.txt
View File

@@ -9,6 +9,12 @@ if((SWIFT_BUILD_CLANG_OVERLAYS
list(APPEND swift_stdlib_unittest_darwin_dependencies _Builtin_float)
endif()
if(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION)
# This library imports Foundation from the SDK, which re-exports
# Observation which is part of this build.
list(APPEND swift_stdlib_unittest_darwin_dependencies Observation)
endif()
set(swift_stdlib_unittest_compile_flags
"-Xfrontend" "-disable-objc-attr-requires-foundation-module")

12
stdlib/private/StdlibUnittestFoundationExtras/CMakeLists.txt
View File

@@ -1,9 +1,21 @@
if(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION)
# This library imports Foundation from the SDK, which re-exports
# Observation which is part of this build.
list(APPEND swift_stdlib_unittest_foundationextras_darwin_dependencies Observation)
endif()
add_swift_target_library(swiftStdlibUnittestFoundationExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
# This file should be listed the first. Module name is inferred from the
# filename.
StdlibUnittestFoundationExtras.swift
UnavailableFoundationMethodThunks.mm
SWIFT_MODULE_DEPENDS_IOS ${swift_stdlib_unittest_foundationextras_darwin_dependencies}
SWIFT_MODULE_DEPENDS_OSX ${swift_stdlib_unittest_foundationextras_darwin_dependencies}
SWIFT_MODULE_DEPENDS_TVOS ${swift_stdlib_unittest_foundationextras_darwin_dependencies}
SWIFT_MODULE_DEPENDS_WATCHOS ${swift_stdlib_unittest_foundationextras_darwin_dependencies}
SWIFT_MODULE_DEPENDS_XROS ${swift_stdlib_unittest_foundationextras_darwin_dependencies}
SWIFT_MODULE_DEPENDS_MACCATALYST ${swift_stdlib_unittest_foundationextras_darwin_dependencies}
SWIFT_MODULE_DEPENDS StdlibUnittest
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
INSTALL_IN_COMPONENT stdlib-experimental