diff options
| author | Brad King <brad.king@kitware.com> | 2023-09-22 19:07:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-09-26 14:04:08 (GMT) |
| commit | cc5d6134ad7d0a5112d14febabf373b6ce01b5b9 (patch) | |
| tree | 8320e6e1203675661596d6a95b964f299b0963ac /Tests/RunCMake/XcodeProject-Device | |
| parent | f9f5751d1875bc9d2fac754af04dae9437ac07b1 (diff) | |
| download | CMake-cc5d6134ad7d0a5112d14febabf373b6ce01b5b9.zip CMake-cc5d6134ad7d0a5112d14febabf373b6ce01b5b9.tar.gz CMake-cc5d6134ad7d0a5112d14febabf373b6ce01b5b9.tar.bz2 | |
Tests: Disable visionOS cases because Xcode 15.0 excludes support
In commit 25977e177b (apple: add preliminary visionOS support, 2023-06-22)
we added visionOS based on a Xcode 15 beta version, but the Xcode 15.0
final release did not include it. Disable the test cases until we can
improve the condition to detect availability.
Issue: #25266
Diffstat (limited to 'Tests/RunCMake/XcodeProject-Device')
| -rw-r--r-- | Tests/RunCMake/XcodeProject-Device/RunCMakeTest.cmake | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/Tests/RunCMake/XcodeProject-Device/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject-Device/RunCMakeTest.cmake index abb357b..e4dbb90 100644 --- a/Tests/RunCMake/XcodeProject-Device/RunCMakeTest.cmake +++ b/Tests/RunCMake/XcodeProject-Device/RunCMakeTest.cmake @@ -93,24 +93,25 @@ if(NOT XCODE_VERSION VERSION_LESS 7.1) unset(RunCMake_TEST_OPTIONS) endif() -if(NOT XCODE_VERSION VERSION_LESS 15) - set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesVisionOS-build) - set(RunCMake_TEST_NO_CLEAN 1) - set(RunCMake_TEST_OPTIONS - "-DCMAKE_SYSTEM_NAME=visionOS" - "-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install") - - file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") - file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") - - run_cmake(XcodeBundles) - run_cmake_command(XcodeBundles-build-visionOS ${CMAKE_COMMAND} --build .) - run_cmake_command(XcodeBundles-install-visionOS ${CMAKE_COMMAND} --build . --target install) - - unset(RunCMake_TEST_BINARY_DIR) - unset(RunCMake_TEST_NO_CLEAN) - unset(RunCMake_TEST_OPTIONS) -endif() +#FIXME(#25266): Xcode 15.0 does not have visionOS. Improve this condition. +#if(NOT XCODE_VERSION VERSION_LESS 15) +# set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesVisionOS-build) +# set(RunCMake_TEST_NO_CLEAN 1) +# set(RunCMake_TEST_OPTIONS +# "-DCMAKE_SYSTEM_NAME=visionOS" +# "-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install") +# +# file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") +# file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") +# +# run_cmake(XcodeBundles) +# run_cmake_command(XcodeBundles-build-visionOS ${CMAKE_COMMAND} --build .) +# run_cmake_command(XcodeBundles-install-visionOS ${CMAKE_COMMAND} --build . --target install) +# +# unset(RunCMake_TEST_BINARY_DIR) +# unset(RunCMake_TEST_NO_CLEAN) +# unset(RunCMake_TEST_OPTIONS) +#endif() if(NOT XCODE_VERSION VERSION_LESS 7) set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/osx.cmake") @@ -261,10 +262,11 @@ if(XCODE_VERSION VERSION_GREATER_EQUAL 8) deployment_target_test(tvOS appletvsimulator) deployment_target_test(watchOS watchos) deployment_target_test(watchOS watchsimulator) - if(XCODE_VERSION VERSION_GREATER_EQUAL 15) - deployment_target_test(visionOS xros) - deployment_target_test(visionOS xrsimulator) - endif() + #FIXME(#25266): Xcode 15.0 does not have visionOS. Improve this condition. + #if(XCODE_VERSION VERSION_GREATER_EQUAL 15) + # deployment_target_test(visionOS xros) + # deployment_target_test(visionOS xrsimulator) + #endif() endif() if(XCODE_VERSION VERSION_GREATER_EQUAL 8) |