From 45eca7bd6ea7ab5071147961682d287c57120b40 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 4 Nov 2021 12:25:29 +0100 Subject: [PATCH] Use macdeployqt when building in all cases --- .../cmake_builder/linphone_package/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt index b218ab4ca..bebe29752 100644 --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt @@ -213,13 +213,13 @@ elseif (APPLE) ) install(CODE "execute_process(COMMAND install_name_tool -add_rpath \"@executable_path/../Frameworks/\" \"\${CMAKE_INSTALL_PREFIX}/${APPLICATION_NAME}.app/Contents/MacOS/${EXECUTABLE_NAME}\")") install(CODE "execute_process(COMMAND install_name_tool -add_rpath \"@executable_path/../lib/\" \"\${CMAKE_INSTALL_PREFIX}/${APPLICATION_NAME}.app/Contents/MacOS/${EXECUTABLE_NAME}\")") - if(ENABLE_APP_PACKAGING) - find_program(DEPLOYQT_PROGRAM macdeployqt) - if (NOT DEPLOYQT_PROGRAM) - message(FATAL_ERROR "Could not find the macdeployqt program. Make sure it is in the PATH.") - endif() - install(CODE "execute_process(COMMAND ${DEPLOYQT_PROGRAM} \${CMAKE_INSTALL_PREFIX}/${APPLICATION_NAME}.app -qmldir=${LINPHONE_QML_DIR})") + + find_program(DEPLOYQT_PROGRAM macdeployqt) + if (NOT DEPLOYQT_PROGRAM) + message(FATAL_ERROR "Could not find the macdeployqt program. Make sure it is in the PATH.") endif() + install(CODE "execute_process(COMMAND ${DEPLOYQT_PROGRAM} \${CMAKE_INSTALL_PREFIX}/${APPLICATION_NAME}.app -qmldir=${LINPHONE_QML_DIR})") + if (LINPHONE_BUILDER_SIGNING_IDENTITY) install(CODE "file(GLOB FRAMEWORKS_NAMES \"\${CMAKE_INSTALL_PREFIX}/${APPLICATION_NAME}.app/Contents/Frameworks/*\") foreach (FRAMEWORK \${FRAMEWORKS_NAMES})