diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-09 16:35:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-02-09 16:37:40 (GMT) |
| commit | 5b5acb557a03b77a3500b467b4c477ad4bfe56b5 (patch) | |
| tree | c58cb9287994b3bc1a5b00722edabf275ea18aea /Tests | |
| parent | 871a4c5aacce720c22dd5569f79c4dcb0ca3680a (diff) | |
| download | CMake-5b5acb557a03b77a3500b467b4c477ad4bfe56b5.zip CMake-5b5acb557a03b77a3500b467b4c477ad4bfe56b5.tar.gz CMake-5b5acb557a03b77a3500b467b4c477ad4bfe56b5.tar.bz2 | |
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
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CMakePackage/RunCMakeTest.cmake | 7 | ||||
| -rw-r--r-- | 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 ) |