diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-11 09:37:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-06-11 09:37:53 (GMT) |
| commit | 65f2e9263c2e12b183aaafd132e1a4be45e84499 (patch) | |
| tree | 792bb106e413d69f8b8d4b31191a5380dc5ecda7 /Modules | |
| parent | f02b6afdfa0a9f6cefb04ff798d429f753baa3ef (diff) | |
| parent | 627c08e28bdf35a85b53f8b5fe46de03de80c2fd (diff) | |
| download | CMake-65f2e9263c2e12b183aaafd132e1a4be45e84499.zip CMake-65f2e9263c2e12b183aaafd132e1a4be45e84499.tar.gz CMake-65f2e9263c2e12b183aaafd132e1a4be45e84499.tar.bz2 | |
Merge branch 'xcode-14' into release-3.23
Merge-request: !7350
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 2 | ||||
| -rw-r--r-- | Modules/CompilerId/Xcode-3.pbxproj.in | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 5670509..c2e0fa8 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -617,6 +617,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} endif() endif() if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT MATCHES "^$|[Mm][Aa][Cc][Oo][Ss]") + set(id_code_sign_identity "-") # When targeting macOS, use only the host architecture. if (_CMAKE_APPLE_ARCHS_DEFAULT) set(id_archs "ARCHS = \"${_CMAKE_APPLE_ARCHS_DEFAULT}\";") @@ -626,6 +627,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} set(id_arch_active "ONLY_ACTIVE_ARCH = YES;") endif() else() + set(id_code_sign_identity "") set(id_archs "") set(id_arch_active "ONLY_ACTIVE_ARCH = YES;") endif() diff --git a/Modules/CompilerId/Xcode-3.pbxproj.in b/Modules/CompilerId/Xcode-3.pbxproj.in index aab357a..43e8cc8 100644 --- a/Modules/CompilerId/Xcode-3.pbxproj.in +++ b/Modules/CompilerId/Xcode-3.pbxproj.in @@ -49,6 +49,7 @@ }; 2C8FEB8E15DC1A1A00E56A5D = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -72,7 +73,7 @@ 1DEB928608733DD80010E9CD = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = ""; + CODE_SIGN_IDENTITY = "@id_code_sign_identity@"; PRODUCT_NAME = CompilerId@id_lang@; }; name = Debug; |