CMake: Apple: Enable catalyst slice

Add the triples to the appropriate Apple build caches, enabling zippered
catalyst builds.

Author: etcwilde

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

@@ -2,15 +2,17 @@ if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
   message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
 endif()
 
+if(NOT DEFINED SwiftCore_TARGET_VARIANT_DEPLOYMENT_TARGET)
+  message(WARNING "SwiftCore_TARGET_VARIANT_DEPLOYMENT_TARGET not defined")
+endif()
+
 set(CMAKE_C_COMPILER_TARGET "arm64e-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
 set(CMAKE_CXX_COMPILER_TARGET "arm64e-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
 set(CMAKE_Swift_COMPILER_TARGET "arm64e-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
 
 set(SwiftCore_ARCH_SUBDIR arm64e CACHE STRING "")
 set(SwiftCore_PLATFORM_SUBDIR macosx CACHE STRING "")
 
-list(APPEND CMAKE_C_FLAGS "-darwin-target-variant" "arm64e-apple-ios13.1-macabi")
-list(APPEND CMAKE_CXX_FLAGS "-darwin-target-variant" "arm64e-apple-ios13.1-macabi")
-list(APPEND CMAKE_Swift_FLAGS "-target-variant" "arm64e-apple-ios13.1-macabi")
+set(SwiftCore_COMPILER_VARIANT_TARGET "arm64e-apple-ios${SwiftCore_TARGET_VARIANT_DEPLOYMENT_TARGET}-macabi" CACHE STRING "")
 
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")

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

@@ -2,15 +2,17 @@ if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
   message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined")
 endif()
 
+if(NOT DEFINED SwiftCore_TARGET_VARIANT_DEPLOYMENT_TARGET)
+  message(WARNING "SwiftCore_TARGET_VARIANT_DEPLOYMENT_TARGET not defined")
+endif()
+
 set(CMAKE_C_COMPILER_TARGET "x86_64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
 set(CMAKE_CXX_COMPILER_TARGET "x86_64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
 set(CMAKE_Swift_COMPILER_TARGET "x86_64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "")
 
 set(SwiftCore_ARCH_SUBDIR x86_64 CACHE STRING "")
 set(SwiftCore_PLATFORM_SUBDIR macosx CACHE STRING "")
 
-list(APPEND CMAKE_C_FLAGS "-darwin-target-variant" "x86_64-apple-ios13.1-macabi")
-list(APPEND CMAKE_CXX_FLAGS "-darwin-target-variant" "x86_64-apple-ios13.1-macabi")
-list(APPEND CMAKE_Swift_FLAGS "-target-variant" "x86_64-apple-ios13.1-macabi")
+set(SwiftCore_COMPILER_VARIANT_TARGET "x86_64-apple-ios${SwiftCore_TARGET_VARIANT_DEPLOYMENT_TARGET}-macabi" CACHE STRING "")
 
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")