mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-20 06:48:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'xcode-restore-ios-tests'

Browse Source 
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
This commit is contained in:
Brad King
2020-09-28 12:41:40 +00:00
committed by Kitware Robot
parent 7fcd5d75f2 2092ab08fe
commit c442c59757
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+9 -14
View File
@@ -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)