echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: Enable RunCMake.CMakePackage visionOS cases with Xcode 15.2

Browse Source 
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
This commit is contained in:
Brad King 2024-02-09 11:35:21 -05:00
parent 871a4c5aac
commit 5b5acb557a
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tests/RunCMake/CMakePackage/RunCMakeTest.cmake
View File

@ -64,10 +64,9 @@ if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
set(watch_archs "armv7k") set(watch_archs "armv7k")
endif() endif()
#FIXME(#25266): Xcode 15.0 does not have visionOS. Improve this condition. if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15.2)
#if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 15) set(enable_visionos 1)
# set(enable_visionos 1) endif()
#endif()
apple_export(macos Darwin "${macos_archs}" macosx) apple_export(macos Darwin "${macos_archs}" macosx)
apple_export(ios iOS "arm64" iphoneos) apple_export(ios iOS "arm64" iphoneos)

4
Tests/RunCMake/CMakePackage/apple-export-common.cmake
View File

@ -21,8 +21,8 @@ generate_apple_platform_selection_file(mylib-config-install.cmake
IOS_SIMULATOR_INCLUDE_FILE ${IOS_SIMULATOR_INCLUDE_FILE} IOS_SIMULATOR_INCLUDE_FILE ${IOS_SIMULATOR_INCLUDE_FILE}
TVOS_INCLUDE_FILE lib/tvos/cmake/mylib/mylib-targets.cmake TVOS_INCLUDE_FILE lib/tvos/cmake/mylib/mylib-targets.cmake
TVOS_SIMULATOR_INCLUDE_FILE lib/tvos-simulator/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_INCLUDE_FILE lib/visionos/cmake/mylib/mylib-targets.cmake
VISIONOS_SIMULATOR_INCLUDE_FILE lib/watchos-simulator/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_INCLUDE_FILE lib/watchos/cmake/mylib/mylib-targets.cmake
WATCHOS_SIMULATOR_INCLUDE_FILE lib/watchos-simulator/cmake/mylib/mylib-targets.cmake WATCHOS_SIMULATOR_INCLUDE_FILE lib/watchos-simulator/cmake/mylib/mylib-targets.cmake
) )