Merge topic 'xcode-tests-prep'

d1688ff300 Tests: Tell Xcode to disallow signing altogether in relevant cases
266f97315b Tests: Update RunCMake.CommandLine to avoid duplicate custom commands
7678fcd577 Tests: Remove workaround from RunCMake.ExternalProject MultiCommand case

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5174

Tests/RunCMake/CommandLine/BuildDir/CMakeLists.txt

@@ -1,8 +1,19 @@
 add_custom_command(
-  OUTPUT output.txt
-  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand > output.txt
+  OUTPUT output1.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand > output1.txt
   )
-add_custom_target(CustomTarget ALL DEPENDS output.txt)
-add_custom_target(CustomTarget2 ALL DEPENDS output.txt)
-add_custom_target(CustomTarget3 ALL DEPENDS output.txt)
+add_custom_target(CustomTarget ALL DEPENDS output1.txt)
+
+add_custom_command(
+  OUTPUT output2.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand2 > output2.txt
+  )
+add_custom_target(CustomTarget2 ALL DEPENDS output2.txt)
+
+add_custom_command(
+  OUTPUT output3.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand2 > output3.txt
+  )
+add_custom_target(CustomTarget3 ALL DEPENDS output3.txt)
+
 add_custom_target(CustomTargetFail COMMAND DoesNotExist)

Tests/RunCMake/CommandLine/ExplicitDirs/CMakeLists.txt

@@ -1,9 +1,20 @@
 cmake_minimum_required(VERSION 3.14)
 project(ExplicitDirs NONE)
+
 add_custom_command(
-  OUTPUT output.txt
-  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand > output.txt
+  OUTPUT output1.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand > output1.txt
   )
-add_custom_target(CustomTarget ALL DEPENDS output.txt)
-add_custom_target(CustomTarget2 ALL DEPENDS output.txt)
-add_custom_target(CustomTarget3 ALL DEPENDS output.txt)
+add_custom_target(CustomTarget ALL DEPENDS output1.txt)
+
+add_custom_command(
+  OUTPUT output2.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand2 > output2.txt
+  )
+add_custom_target(CustomTarget2 ALL DEPENDS output2.txt)
+
+add_custom_command(
+  OUTPUT output3.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand2 > output3.txt
+  )
+add_custom_target(CustomTarget3 ALL DEPENDS output3.txt)

Tests/RunCMake/ExternalProject/MultiCommand.cmake

@@ -20,10 +20,6 @@ ExternalProject_Add(multiCommand
           COMMAND   "${CMAKE_COMMAND}" -E echo "install 2"
 )
 
-# Workaround for issue 17229 (missing dependency between update and patch steps)
-ExternalProject_Add_StepTargets(multiCommand NO_DEPENDS update)
-ExternalProject_Add_StepDependencies(multiCommand patch multiCommand-update)
-
 # Force all steps to be re-run by removing timestamps from any previous run
 ExternalProject_Get_Property(multiCommand STAMP_DIR)
 file(REMOVE_RECURSE "${STAMP_DIR}")

Tests/RunCMake/XcodeProject/DeploymentTarget.cmake

@@ -5,15 +5,18 @@ project(DeploymentTarget C)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
   set(CMAKE_OSX_DEPLOYMENT_TARGET "9.1")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
   set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "watchOS")
   set(CMAKE_OSX_DEPLOYMENT_TARGET "2.0")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
   set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "tvOS")
   set(CMAKE_OSX_DEPLOYMENT_TARGET "9.0")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
   set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")

Tests/RunCMake/XcodeProject/XcodeBundles.cmake

@@ -4,12 +4,14 @@ cmake_minimum_required(VERSION 3.3)
 enable_language(C)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
   set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "tvOS" OR CMAKE_SYSTEM_NAME STREQUAL "watchOS")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
   set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")

Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake

@@ -10,6 +10,7 @@ if(NOT IOS)
   message(FATAL_ERROR "IOS variable is not set")
 endif()
 
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
 set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf")

Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune.cmake

@@ -6,6 +6,7 @@ if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
   set(CMAKE_OSX_DEPLOYMENT_TARGET 10)
 endif()
 
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
 set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf")

Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedSingleArch.cmake

@@ -6,6 +6,7 @@ if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
   set(CMAKE_OSX_DEPLOYMENT_TARGET 10)
 endif()
 
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
 set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf")

Tests/XCTest/CMakeLists.txt

@@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.1)
 project(XCTest C)
 enable_testing()
 
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO")
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
+
 find_package(XCTest REQUIRED)
 
 # Framework