From 5b5acb557a03b77a3500b467b4c477ad4bfe56b5 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 9 Feb 2024 11:35:21 -0500 Subject: Tests: Enable RunCMake.CMakePackage visionOS cases with Xcode 15.2 Xcode 15.2 officially includes the visionOS SDKs. Fix a typo from commit 2a398cd9b6 (CMakePackageConfigHelpers: Clarify generate_apple_*_selection_file signatures, 2024-01-04) to make it pass. Issue: #25266 --- Tests/RunCMake/CMakePackage/RunCMakeTest.cmake | 7 +++---- Tests/RunCMake/CMakePackage/apple-export-common.cmake | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Tests/RunCMake/CMakePackage/RunCMakeTest.cmake b/Tests/RunCMake/CMakePackage/RunCMakeTest.cmake index 4145ccc..32fc7fb 100644 --- a/Tests/RunCMake/CMakePackage/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMakePackage/RunCMakeTest.cmake @@ -64,10 +64,9 @@ if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang") set(watch_archs "armv7k") endif() - #FIXME(#25266): Xcode 15.0 does not have visionOS. Improve this condition. - #if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15) - # set(enable_visionos 1) - #endif() + if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15.2) + set(enable_visionos 1) + endif() apple_export(macos Darwin "${macos_archs}" macosx) apple_export(ios iOS "arm64" iphoneos) diff --git a/Tests/RunCMake/CMakePackage/apple-export-common.cmake b/Tests/RunCMake/CMakePackage/apple-export-common.cmake index 15e98eb..2c79b7b 100644 --- a/Tests/RunCMake/CMakePackage/apple-export-common.cmake +++ b/Tests/RunCMake/CMakePackage/apple-export-common.cmake @@ -21,8 +21,8 @@ generate_apple_platform_selection_file(mylib-config-install.cmake IOS_SIMULATOR_INCLUDE_FILE ${IOS_SIMULATOR_INCLUDE_FILE} TVOS_INCLUDE_FILE lib/tvos/cmake/mylib/mylib-targets.cmake TVOS_SIMULATOR_INCLUDE_FILE lib/tvos-simulator/cmake/mylib/mylib-targets.cmake - VISIONOS_INCLUDE_FILE lib/watchos/cmake/mylib/mylib-targets.cmake - VISIONOS_SIMULATOR_INCLUDE_FILE lib/watchos-simulator/cmake/mylib/mylib-targets.cmake + VISIONOS_INCLUDE_FILE lib/visionos/cmake/mylib/mylib-targets.cmake + VISIONOS_SIMULATOR_INCLUDE_FILE lib/visionos-simulator/cmake/mylib/mylib-targets.cmake WATCHOS_INCLUDE_FILE lib/watchos/cmake/mylib/mylib-targets.cmake WATCHOS_SIMULATOR_INCLUDE_FILE lib/watchos-simulator/cmake/mylib/mylib-targets.cmake ) -- cgit v0.12