Skip to content

Commit 95219bb

Browse files
Set SwiftCore_ARCH_SUBDIR and SwiftCore_PLATFORM_SUBDIR as CACHE variables properly for Bridge and TVos (#78784)
1 parent 499146d commit 95219bb

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

Runtimes/Core/cmake/caches/Vendors/Apple/arm64-AppleTVOS-simulator.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simu
66
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
77
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
88

9-
set(SwiftCore_ARCH_SUBDIR arm64)
10-
set(SwiftCore_PLATFORM_SUBDIR appletvsimulator)
9+
set(SwiftCore_ARCH_SUBDIR arm64 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR appletvsimulator CACHE STRING "")
1111

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

Runtimes/Core/cmake/caches/Vendors/Apple/arm64-AppleTVOS.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CAC
66
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
77
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
88

9-
set(SwiftCore_ARCH_SUBDIR arm64)
10-
set(SwiftCore_PLATFORM_SUBDIR appletvos)
9+
set(SwiftCore_ARCH_SUBDIR arm64 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR appletvos CACHE STRING "")
1111

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

Runtimes/Core/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ set(CMAKE_C_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}"
66
set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
77
set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
88

9-
set(SwiftCore_ARCH_SUBDIR arm64)
10-
set(SwiftCore_PLATFORM_SUBDIR freestanding)
9+
set(SwiftCore_ARCH_SUBDIR arm64 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR freestanding CACHE STRING "")
1111
set(CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "")
1212

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

Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-AppleTVOS.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64e-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CA
66
set(CMAKE_CXX_COMPILER_TARGET "arm64e-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
77
set(CMAKE_Swift_COMPILER_TARGET "arm64e-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
88

9-
set(SwiftCore_ARCH_SUBDIR arm64e)
10-
set(SwiftCore_PLATFORM_SUBDIR appletvos)
9+
set(SwiftCore_ARCH_SUBDIR arm64e CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR appletvos CACHE STRING "")
1111

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

Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-AppleTVOS-simulator.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "x86_64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-sim
66
set(CMAKE_CXX_COMPILER_TARGET "x86_64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
77
set(CMAKE_Swift_COMPILER_TARGET "x86_64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "")
88

9-
set(SwiftCore_ARCH_SUBDIR x86_64)
10-
set(SwiftCore_PLATFORM_SUBDIR appletvsimulator)
9+
set(SwiftCore_ARCH_SUBDIR x86_64 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR appletvsimulator CACHE STRING "")
1111

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

0 commit comments

Comments
 (0)