diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-09 16:37:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-02-09 16:37:11 (GMT) |
| commit | 871a4c5aacce720c22dd5569f79c4dcb0ca3680a (patch) | |
| tree | 69c2b0f66465e4a40ae472998eb13f07f03fd5bb /Tests/RunCMake/XcFramework | |
| parent | c673511263822c688fa302120a29e1e0cf812c0b (diff) | |
| parent | 22eb1b6d678f13506e9cfa92090d9ff9886f0c8c (diff) | |
| download | CMake-871a4c5aacce720c22dd5569f79c4dcb0ca3680a.zip CMake-871a4c5aacce720c22dd5569f79c4dcb0ca3680a.tar.gz CMake-871a4c5aacce720c22dd5569f79c4dcb0ca3680a.tar.bz2 | |
Merge branch 'backport-3.28-visionOS' into visionOS
Diffstat (limited to 'Tests/RunCMake/XcFramework')
| -rw-r--r-- | Tests/RunCMake/XcFramework/RunCMakeTest.cmake | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/Tests/RunCMake/XcFramework/RunCMakeTest.cmake b/Tests/RunCMake/XcFramework/RunCMakeTest.cmake index fad088f..0d181ca 100644 --- a/Tests/RunCMake/XcFramework/RunCMakeTest.cmake +++ b/Tests/RunCMake/XcFramework/RunCMakeTest.cmake @@ -14,17 +14,15 @@ function(create_libraries type) create_library(${type} ios iOS "arm64" iphoneos) create_library(${type} tvos tvOS "arm64" appletvos) create_library(${type} watchos watchOS "armv7k\\\\;arm64_32" watchos) - #FIXME(#25266): Xcode 15.0 does not have visionOS. Improve this condition. - #if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15) - # create_library(${type} visionos visionOS "arm64" xros) - #endif() + if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15.2) + create_library(${type} visionos visionOS "arm64" xros) + endif() create_library(${type} ios-simulator iOS "${macos_archs_2}" iphonesimulator) create_library(${type} tvos-simulator tvOS "${macos_archs_2}" appletvsimulator) create_library(${type} watchos-simulator watchOS "${watch_sim_archs_2}" watchsimulator) - #FIXME(#25266): Xcode 15.0 does not have visionOS. Improve this condition. - #if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15) - # create_library(${type} visionos-simulator visionOS "${macos_archs_2}" xrsimulator) - #endif() + if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15.2) + create_library(${type} visionos-simulator visionOS "${macos_archs_2}" xrsimulator) + endif() endfunction() function(create_xcframework name type platforms) @@ -62,24 +60,21 @@ function(create_executables name type) create_executable(${name}-ios ${type} iOS "arm64" iphoneos) create_executable(${name}-tvos ${type} tvOS "arm64" appletvos) create_executable(${name}-watchos ${type} watchOS "armv7k\\\\;arm64_32" watchos) - #FIXME(#25266): Xcode 15.0 does not have visionOS. Improve this condition. - #if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15) - # create_executable(${name}-visionos ${type} visionOS "arm64" xros) - #endif() + if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15.2) + create_executable(${name}-visionos ${type} visionOS "arm64" xros) + endif() create_executable(${name}-ios-simulator ${type} iOS "${macos_archs_2}" iphonesimulator) create_executable(${name}-tvos-simulator ${type} tvOS "${macos_archs_2}" appletvsimulator) create_executable(${name}-watchos-simulator ${type} watchOS "${watch_sim_archs_2}" watchsimulator) - #FIXME(#25266): Xcode 15.0 does not have visionOS. Improve this condition. - #if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15) - # create_executable(${name}-visionos-simulator ${type} visionOS "${macos_archs_2}" xrsimulator) - #endif() + if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15.2) + create_executable(${name}-visionos-simulator ${type} visionOS "${macos_archs_2}" xrsimulator) + endif() endfunction() set(xcframework_platforms macos ios tvos watchos ios-simulator tvos-simulator watchos-simulator) -#FIXME(#25266): Xcode 15.0 does not have visionOS. Improve this condition. -#if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15) -# list(APPEND xcframework_platforms visionos visionos-simulator) -#endif() +if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15.2) + list(APPEND xcframework_platforms visionos visionos-simulator) +endif() if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 12) set(macos_archs_1 "x86_64\\;arm64") set(macos_archs_2 "x86_64\\\\;arm64") |