Merge topic 'ios-mac-catalyst' into release-3.31

b49b03a Xcode: Use ad-hoc signing during compiler id for iOS Mac Catalyst Acked-by: Kitware Robot <[email protected]> Merge-request: !9908
Kitware · Oct 17, 2024 · fb1a327 · fb1a327
2 parents 98ccd88 + b49b03a
commit fb1a327
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)