From fe258f638276c879bbdd2ac165ac4caba0efc921 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 15 Sep 2020 14:01:16 -0400 Subject: Tests: Skip RunCMake.XcodeProject device cases for Xcode "new build system" The Xcode "new build system" selects different architectures for device builds than the old build system does. Skip those tests on Xcode 12+ pending further investigation. Issue: #21206 --- Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake index 68de61c..34fc26e 100644 --- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake @@ -108,6 +108,11 @@ 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) -- cgit v0.12