From 9aeb2377dccd3ed8eee71f47df7e71cae5965681 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 13 Apr 2023 15:51:45 -0400
Subject: [PATCH] packaging: macos: simplify macdeployqt execution

Don't use a post build step, as it's only needed for packaging.

Change-Id: I1be4e7ac8042e1f211b4eeb15bc869e16eda1682
---
 CMakeLists.txt                           | 41 ++++++++++++------------
 extras/build/cmake/macos_qt_deploy.cmake |  7 ----
 2 files changed, 21 insertions(+), 27 deletions(-)
 delete mode 100644 extras/build/cmake/macos_qt_deploy.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e802357f1..3f0baa97f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -852,26 +852,27 @@ else()
           MACOSX_BUNDLE_SHORT_VERSION_STRING "${JAMI_VERSION}"
           MACOSX_BUNDLE_BUNDLE_VERSION "${JAMI_BUILD}"
           MACOSX_BUNDLE_COPYRIGHT "${PROJ_COPYRIGHT}")
-      if(APPSTORE)
-          message(STATUS "app store version")
-          set_target_properties(${PROJECT_NAME} PROPERTIES
-               XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/resources/entitlements/appstore/Jami.entitlements")
-      else()
-          set_target_properties(${PROJECT_NAME} PROPERTIES
-                SPARKLE_URL "${SPARKLE_URL}"
-                SPARKLE_PUBLIC_KEY "${SPARKLE_PUBLIC_KEY}"
-                XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/resources/entitlements/Jami.entitlements"
-                XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME TRUE)
-      endif()
-      if(DEPLOY)
-          add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-                             COMMAND ${CMAKE_COMMAND} -DQML_SRC_DIR=${SRC_DIR}
-                             -DMAC_DEPLOY_QT_PATH=${CMAKE_PREFIX_PATH}/bin
-                             -DEXE_NAME="${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app"
-                             -DSPARKLE_PATH=${SPARKLE_FRAMEWORK}
-                             -DENABLE_SPARKLE=${ENABLE_SPARKLE}
-                             -P ${EXTRAS_DIR}/build/cmake/macos_qt_deploy.cmake)
-      endif()
+  if(APPSTORE)
+    message(STATUS "app store version")
+    set_target_properties(${PROJECT_NAME} PROPERTIES
+          XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/resources/entitlements/appstore/Jami.entitlements")
+  else()
+    set_target_properties(${PROJECT_NAME} PROPERTIES
+          SPARKLE_URL "${SPARKLE_URL}"
+          SPARKLE_PUBLIC_KEY "${SPARKLE_PUBLIC_KEY}"
+          XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/resources/entitlements/Jami.entitlements"
+          XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME TRUE)
+  endif()
+  if(DEPLOY)
+    message("Qt deploying in dir " ${QML_SRC_DIR})
+    execute_process(COMMAND
+      "${CMAKE_PREFIX_PATH}/bin/macdeployqt"
+      "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app"
+      -qmldir=${QML_SRC_DIR})
+    if(${ENABLE_SPARKLE} MATCHES true)
+      file(COPY ${SPARKLE_FRAMEWORK} DESTINATION ${EXE_NAME}/Contents/Frameworks/)
+    endif()
+  endif()
 endif()
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${CLIENT_INCLUDE_DIRS})
diff --git a/extras/build/cmake/macos_qt_deploy.cmake b/extras/build/cmake/macos_qt_deploy.cmake
deleted file mode 100644
index cf12292a0..000000000
--- a/extras/build/cmake/macos_qt_deploy.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-message("Qt deploying in dir " ${QML_SRC_DIR})
-execute_process(COMMAND "${MAC_DEPLOY_QT_PATH}/macdeployqt"
-                            ${EXE_NAME}
-                            -qmldir=${QML_SRC_DIR})
-if(${ENABLE_SPARKLE} MATCHES true)
-    file(COPY ${SPARKLE_PATH} DESTINATION ${EXE_NAME}/Contents/Frameworks/)
-endif()
\ No newline at end of file