diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-28 12:41:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-28 12:41:47 (GMT) |
| commit | c442c59757fd57fa6ddaa4b0b2d49bd8524facca (patch) | |
| tree | d0a44c669df6bef66bfda42ddfe7b966592f4b07 | |
| parent | 7fcd5d75f2cd0ee5b28f25db4e36ab7999cbd18c (diff) | |
| parent | 2092ab08fe0aba0ee7efc8353d27bfc22bf73b61 (diff) | |
| download | CMake-c442c59757fd57fa6ddaa4b0b2d49bd8524facca.zip CMake-c442c59757fd57fa6ddaa4b0b2d49bd8524facca.tar.gz CMake-c442c59757fd57fa6ddaa4b0b2d49bd8524facca.tar.bz2 | |
Merge topic 'xcode-restore-ios-tests'
2092ab08fe xcode: conditionally enable combined install tests
62ce9e16e0 xcode: annotate test output with selected SDK
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5271
| -rw-r--r-- | Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake index 34fc26e..62163ac 100644 --- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake @@ -108,11 +108,6 @@ XcodeRemoveExcessiveISystem() # Isolate device tests from host architecture selection. unset(ENV{CMAKE_OSX_ARCHITECTURES}) -if(XCODE_VERSION VERSION_GREATER_EQUAL 12) - # FIXME: Restore device tests and fix them for the Xcode "new build system" - return() -endif() - # Use a single build tree for a few tests without cleaning. if(NOT XCODE_VERSION VERSION_LESS 5) @@ -142,8 +137,8 @@ if(NOT XCODE_VERSION VERSION_LESS 5) file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") run_cmake(XcodeBundles) - run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .) - run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target install) + run_cmake_command(XcodeBundles-build-macOS ${CMAKE_COMMAND} --build .) + run_cmake_command(XcodeBundles-install-macOS ${CMAKE_COMMAND} --build . --target install) unset(RunCMake_TEST_BINARY_DIR) unset(RunCMake_TEST_NO_CLEAN) @@ -159,8 +154,8 @@ if(NOT XCODE_VERSION VERSION_LESS 5) file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") run_cmake(XcodeBundles) - run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .) - run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target install) + run_cmake_command(XcodeBundles-build-iOS ${CMAKE_COMMAND} --build .) + run_cmake_command(XcodeBundles-install-iOS ${CMAKE_COMMAND} --build . --target install) unset(RunCMake_TEST_BINARY_DIR) unset(RunCMake_TEST_NO_CLEAN) @@ -178,8 +173,8 @@ if(NOT XCODE_VERSION VERSION_LESS 7) file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") run_cmake(XcodeBundles) - run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .) - run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target install) + run_cmake_command(XcodeBundles-build-watchOS ${CMAKE_COMMAND} --build .) + run_cmake_command(XcodeBundles-install-watchOS ${CMAKE_COMMAND} --build . --target install) unset(RunCMake_TEST_BINARY_DIR) unset(RunCMake_TEST_NO_CLEAN) @@ -197,8 +192,8 @@ if(NOT XCODE_VERSION VERSION_LESS 7.1) file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") run_cmake(XcodeBundles) - run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .) - run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target install) + run_cmake_command(XcodeBundles-build-tvOS ${CMAKE_COMMAND} --build .) + run_cmake_command(XcodeBundles-install-tvOS ${CMAKE_COMMAND} --build . --target install) unset(RunCMake_TEST_BINARY_DIR) unset(RunCMake_TEST_NO_CLEAN) @@ -211,7 +206,7 @@ if(NOT XCODE_VERSION VERSION_LESS 7) unset(RunCMake_TEST_OPTIONS) endif() -if(NOT XCODE_VERSION VERSION_LESS 6) +if(XCODE_VERSION VERSION_GREATER_EQUAL 6 AND XCODE_VERSION VERSION_LESS 12) # XcodeIOSInstallCombined set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeIOSInstallCombined-build) set(RunCMake_TEST_NO_CLEAN 1) |