diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 06aff2195b..a778035140 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -124,6 +124,22 @@ else()
     set(QUAZIP_LIBRARY quazip)
 endif()
 
+# Setup code signing for macOS
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(CODESIGN_IDENTITY "-" CACHE STRING
+            "Code signing identity to use for macOS signing")
+
+    if(DEFINED ENV{CODESIGN_IDENTITY})
+        set(CODESIGN_IDENTITY "$ENV{CODESIGN_IDENTITY}")
+    endif()
+
+    if("${CODESIGN_IDENTITY}" STREQUAL "-")
+        message("-- Using ad-hoc Apple code signing")
+    else()
+        message("-- Using Apple code signing identity: ${CODESIGN_IDENTITY}")
+    endif()
+endif()
+
 add_executable(ipodpatcher-bin
     ipodpatcher/main.c
     ipodpatcher/ipodpatcher_aupd.c
diff --git a/utils/cmake/deploy.cmake b/utils/cmake/deploy.cmake
index 7d4da8f3be..757445c67f 100644
--- a/utils/cmake/deploy.cmake
+++ b/utils/cmake/deploy.cmake
@@ -94,19 +94,6 @@ endif()
 
 # MacOS: Build dmg
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    set(CODESIGN_IDENTITY "-" CACHE STRING
-            "Code signing identity to use for macOS signing")
-
-    if(DEFINED ENV{CODESIGN_IDENTITY})
-        set(CODESIGN_IDENTITY "$ENV{CODESIGN_IDENTITY}")
-    endif()
-
-    if("${CODESIGN_IDENTITY}" STREQUAL "-")
-        message("-- Using ad-hoc Apple code signing")
-    else()
-        message("-- Using Apple code signing identity: ${CODESIGN_IDENTITY}")
-    endif()
-
     set(DMGBUILD_STAMP ${CMAKE_BINARY_DIR}/dmgbuild.stamp)
     add_custom_command(
             COMMENT "Setting up dmgbuild virtualenv"