From 54a2947309279105dc548d8b8e7d34a584149f3b Mon Sep 17 00:00:00 2001
From: kkostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Thu, 13 Jan 2022 20:58:18 -0500
Subject: [PATCH] build: make deploy optional on macOS
Sometimes deploy failed with qmlimportscanner error. For better
control macdeployqt will be called manually for release
builds.
Gitlab: #578
Change-Id: Ic3a781cb4680499bbb7e479e31764f3f35e29800
---
CMakeLists.txt | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca3b06c7b..b5ff3ee74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -666,13 +666,15 @@ else()
SPARKLE_URL "${SPARKLE_URL}"
XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/resources/entitlements/Jami.entitlements"
XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME TRUE)
- 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 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos_qt_deploy.cmake)
+ 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 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos_qt_deploy.cmake)
+ endif()
endif()
qt_import_qml_plugins(${PROJECT_NAME})
--
GitLab