Skip to content

Commit 9eb24e0

Browse files
authored
Merge pull request #84718 from edymtt/edymtt/add-apple-vendor-caches-for-runtimes
Add Apple vendor caches for Runtime
2 parents 2af325f + 5e39a61 commit 9eb24e0

22 files changed

+273
-2
lines changed

Runtimes/Supplemental/Distributed/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARG
99
set(SwiftDistributed_ARCH_SUBDIR arm64 CACHE STRING "")
1010
set(SwiftDistributed_PLATFORM_SUBDIR freestanding CACHE STRING "")
1111
set(CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "")
12-
set(SwiftDistributed_SINGLE_THREADED_MODE YES CACHE BOOL "")
1312

1413
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

Runtimes/Supplemental/Observation/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARG
99
set(SwiftObservation_ARCH_SUBDIR arm64 CACHE STRING "")
1010
set(SwiftObservation_PLATFORM_SUBDIR freestanding CACHE STRING "")
1111
set(CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "")
12-
set(SwiftObservation_SINGLE_THREADED_MODE YES CACHE BOOL "")
1312

1413
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "")
2+
set(BUILD_SHARED_LIBS YES CACHE BOOL "")
3+
set(SwiftRuntime_INSTALL_NESTED_SUBDIR OFF CACHE BOOL "")
4+
5+
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -g -DNDEBUG" CACHE STRING "")
6+
set(CMAKE_C_FLAGS_MINSIZEREL "-Os -g -DNDEBUG" CACHE STRING "")
7+
set(CMAKE_Swift_FLAGS_MINSIZEREL "-Osize -g" CACHE STRING "")
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
2+
message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
3+
endif()
4+
5+
set(CMAKE_C_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
6+
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
7+
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
8+
set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
9+
10+
set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "")
11+
set(SwiftRuntime_PLATFORM_SUBDIR appletvsimulator CACHE STRING "")
12+
13+
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
2+
message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
3+
endif()
4+
5+
set(CMAKE_C_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
6+
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
7+
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
8+
set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
9+
10+
set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "")
11+
set(SwiftRuntime_PLATFORM_SUBDIR appletvos CACHE STRING "")
12+
13+
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
2+
message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
3+
endif()
4+
5+
set(CMAKE_C_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
6+
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
7+
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
8+
set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
9+
10+
set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "")
11+
set(SwiftRuntime_PLATFORM_SUBDIR freestanding CACHE STRING "")
12+
set(CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "")
13+
14+
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
2+
message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
3+
endif()
4+
5+
if(NOT DEFINED SwiftRuntime_TARGET_VARIANT_DEPLOYMENT_TARGET)
6+
message(SEND_ERROR "SwiftRuntime_TARGET_VARIANT_DEPLOYMENT_TARGET not defined")
7+
endif()
8+
9+
set(CMAKE_C_COMPILER_TARGET "arm64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
10+
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
11+
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
12+
set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
13+
14+
set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "")
15+
set(SwiftRuntime_PLATFORM_SUBDIR macosx CACHE STRING "")
16+
17+
set(SwiftRuntime_COMPILER_VARIANT_TARGET "arm64-apple-ios${SwiftRuntime_TARGET_VARIANT_DEPLOYMENT_TARGET}-macabi" CACHE STRING "")
18+
19+
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
2+
message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
3+
endif()
4+
5+
set(CMAKE_C_COMPILER_TARGET "arm64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
6+
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
7+
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
8+
set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
9+
10+
set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "")
11+
set(SwiftRuntime_PLATFORM_SUBDIR watchsimulator CACHE STRING "")
12+
13+
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
2+
message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
3+
endif()
4+
5+
set(CMAKE_C_COMPILER_TARGET "arm64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
6+
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
7+
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
8+
set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
9+
10+
set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "")
11+
set(SwiftRuntime_PLATFORM_SUBDIR xrsimulator CACHE STRING "")
12+
13+
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
2+
message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
3+
endif()
4+
5+
set(CMAKE_C_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
6+
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
7+
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
8+
set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
9+
10+
set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "")
11+
set(SwiftRuntime_PLATFORM_SUBDIR iphonesimulator CACHE STRING "")
12+
13+
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

0 commit comments

Comments
 (0)