From b49b03a62e5eb428f34af047debf807159c1f1a7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 16 Oct 2024 14:40:48 -0400 Subject: [PATCH] Xcode: Use ad-hoc signing during compiler id for iOS Mac Catalyst In commit 2785364b7b (iOS: Add support for Mac Catalyst, 2024-07-02, v3.31.0-rc1~371^2) we forgot to update the conditions to use ad-hoc signing from commit 89e1113e0c (Xcode: Use ad-hoc signing during compiler id on macOS, 2022-06-10, v3.22.6~4^2~2). Fixes: #26376 --- Modules/CMakeDetermineCompilerId.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 378e46fe98..5e880761ad 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -734,7 +734,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} set(id_clang_cxx_library "CLANG_CXX_LIBRARY = \"${CMAKE_MATCH_3}\";") endif() endif() - if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT MATCHES "^$|[Mm][Aa][Cc][Oo][Ss]") + if(CMAKE_OSX_SYSROOT MATCHES "[Mm][Aa][Cc][Oo][Ss]" OR (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT STREQUAL "")) set(id_code_sign_identity "-") # When targeting macOS, use only the host architecture. if (_CMAKE_APPLE_ARCHS_DEFAULT)