Skip to content

Commit aed70b3

Browse files
etcwildeetcwilde
committed
SwiftCore: CMake: Update Apple caches
Updating the Apple cmake caches to enable the filesystem support, setting the appropriate architecture and platform subdirectories.
1 parent 47abc58 commit aed70b3

19 files changed

+55
-0
lines changed

‎Runtimes/Core/cmake/caches/Vendors/Apple/apple-common.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ set(SwiftCore_ENABLE_TYPE_PRINTING ON CACHE BOOL "")
1111
set(SwiftCore_ENABLE_VECTOR_TYPES ON CACHE BOOL "")
1212
set(SwiftCore_ENABLE_RUNTIME_FUNCTION_COUNTERS ON CACHE BOOL "")
1313
set(SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT ON CACHE BOOL "")
14+
set(SwiftCore_ENABLE_FILESYSTEM_SUPPORT ON CACHE BOOL "")
1415

1516
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -gline-tables-only -DNDEBUG" CACHE STRING "")
1617
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -gline-tables-only -DNDEBUG" CACHE STRING "")

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +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)
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +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)
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ 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)
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Core/cmake/caches/Vendors/Apple/arm64-WatchOS-simulator.cmake

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

9+
set(SwiftCore_ARCH_SUBDIR arm64 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR watchsimulator CACHE STRING "")
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Core/cmake/caches/Vendors/Apple/arm64-XROS-simulator.cmake

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

9+
set(SwiftCore_ARCH_SUBDIR arm64 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR xrsimulator CACHE STRING "")
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Core/cmake/caches/Vendors/Apple/arm64-iPhoneOS-simulator.cmake

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

9+
set(SwiftCore_ARCH_SUBDIR arm64 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR iphonesimulator CACHE STRING "")
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Core/cmake/caches/Vendors/Apple/arm64-iPhoneOS.cmake

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

9+
set(SwiftCore_ARCH_SUBDIR arm64 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR iphoneos CACHE STRING "")
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Core/cmake/caches/Vendors/Apple/arm64_32-WatchOS.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64_32-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET
66
set(CMAKE_CXX_COMPILER_TARGET "arm64_32-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
77
set(CMAKE_Swift_COMPILER_TARGET "arm64_32-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
88

9+
set(SwiftCore_ARCH_SUBDIR arm64_32 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR watchos CACHE STRING "")
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +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)
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-MacOSX.cmake

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

9+
set(SwiftCore_ARCH_SUBDIR arm64e CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR macosx CACHE STRING "")
11+
912
list(APPEND CMAKE_C_FLAGS "-darwin-target-variant" "arm64e-apple-ios13.1-macabi")
1013
list(APPEND CMAKE_CXX_FLAGS "-darwin-target-variant" "arm64e-apple-ios13.1-macabi")
1114
list(APPEND CMAKE_Swift_FLAGS "-target-variant" "arm64e-apple-ios13.1-macabi")

‎Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-WatchOS.cmake

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

9+
set(SwiftCore_ARCH_SUBDIR arm64e CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR watchos CACHE STRING "")
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-XROS.cmake

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

9+
set(SwiftCore_ARCH_SUBDIR arm64e CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR xros CACHE STRING "")
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-iPhoneOS.cmake

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

9+
set(SwiftCore_ARCH_SUBDIR arm64e CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR iphoneos CACHE STRING "")
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +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)
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-MacOSX.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ set(CMAKE_C_COMPILER_TARGET "x86_64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}"
66
set(CMAKE_CXX_COMPILER_TARGET "x86_64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
77
set(CMAKE_Swift_COMPILER_TARGET "x86_64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
88

9+
set(SwiftCore_ARCH_SUBDIR x86_64 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR macosx CACHE STRING "")
11+
912
list(APPEND CMAKE_C_FLAGS "-darwin-target-variant" "x86_64-apple-ios13.1-macabi")
1013
list(APPEND CMAKE_CXX_FLAGS "-darwin-target-variant" "x86_64-apple-ios13.1-macabi")
1114
list(APPEND CMAKE_Swift_FLAGS "-target-variant" "x86_64-apple-ios13.1-macabi")

‎Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-WatchOS-simulator.cmake

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

9+
set(SwiftCore_ARCH_SUBDIR x86_64 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR watchsimulator CACHE STRING "")
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-XROS-simulator.cmake

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

9+
set(SwiftCore_ARCH_SUBDIR x86_64 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR xrsimulator CACHE STRING "")
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

‎Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-iPhoneOS-simulator.cmake

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

9+
set(SwiftCore_ARCH_SUBDIR x86_64 CACHE STRING "")
10+
set(SwiftCore_PLATFORM_SUBDIR iphonesimulator CACHE STRING "")
11+
912
include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

0 commit comments

Comments
 (0)