From 8499b43501f93b5b1cc138773d24040a0d34a52d Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Tue, 30 Jul 2024 21:46:06 -0400 Subject: [PATCH] MacUpdater: Always use the same signing identity as the DolphinQt bundle --- BuildMacOSUniversalBinary.py | 2 -- CMakeLists.txt | 1 - Source/Core/MacUpdater/CMakeLists.txt | 6 +----- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/BuildMacOSUniversalBinary.py b/BuildMacOSUniversalBinary.py index bcf5ce97d6..33973393a6 100755 --- a/BuildMacOSUniversalBinary.py +++ b/BuildMacOSUniversalBinary.py @@ -317,8 +317,6 @@ def build(config): + config[arch+"_mac_os_deployment_target"], "-DMACOS_CODE_SIGNING_IDENTITY=" + config["codesign_identity"], - "-DMACOS_CODE_SIGNING_IDENTITY_UPDATER=" - + config["codesign_identity"], '-DMACOS_CODE_SIGNING="ON"', "-DSTEAM=" + python_to_cmake_bool(config["steam"]), diff --git a/CMakeLists.txt b/CMakeLists.txt index ce5d64715f..e3a33876d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,7 +138,6 @@ if(APPLE) option(MACOS_CODE_SIGNING "Enable codesigning" ON) option(USE_BUNDLED_MOLTENVK "Build MoltenVK from Externals with Dolphin-specific patches" ON) set(MACOS_CODE_SIGNING_IDENTITY "-" CACHE STRING "The identity used for codesigning.") - set(MACOS_CODE_SIGNING_IDENTITY_UPDATER "-" CACHE STRING "The identity used for codesigning, for the updater.") endif() if(CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/Source/Core/MacUpdater/CMakeLists.txt b/Source/Core/MacUpdater/CMakeLists.txt index 71c0408317..60abe88792 100644 --- a/Source/Core/MacUpdater/CMakeLists.txt +++ b/Source/Core/MacUpdater/CMakeLists.txt @@ -54,10 +54,6 @@ foreach(sb ${STORYBOARDS}) endforeach() if(MACOS_CODE_SIGNING) - if (MACOS_CODE_SIGNING_IDENTITY_UPDATER STREQUAL "") - set(MACOS_CODE_SIGNING_IDENTITY_UPDATER "${MACOS_CODE_SIGNING_IDENTITY}") - endif() - add_custom_command(TARGET MacUpdater POST_BUILD - COMMAND /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY_UPDATER}" --deep --options runtime $) + COMMAND /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options runtime $) endif()