From 6531f94f8635d25735852d678e707e60eb375c3b Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Tue, 27 Feb 2018 19:33:55 +0100 Subject: [PATCH] Try to change both the REALPATH and the symlink location --- src/proxy/CMakeLists.txt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/proxy/CMakeLists.txt b/src/proxy/CMakeLists.txt index f19481c06..f4c197e39 100755 --- a/src/proxy/CMakeLists.txt +++ b/src/proxy/CMakeLists.txt @@ -42,14 +42,17 @@ if(WITH_XC_BROWSER) add_custom_command(TARGET keepassxc-proxy POST_BUILD - COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change ${Qt5_PREFIX}/lib/QtCore.framework/Versions/5/QtCore "@executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore" ${PROXY_APP_DIR} + COMMAND ${CMAKE_INSTALL_NAME_TOOL} + -change ${Qt5_PREFIX}/lib/QtCore.framework/Versions/5/QtCore + "@executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore" + -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore + "@executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore" + -change ${Qt5_PREFIX}/lib/QtNetwork.framework/Versions/5/QtNetwork + "@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork" + -change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork + "@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork" + ${PROXY_APP_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src - COMMENT "Changing linking of keepassxc-proxy QtCore") - - add_custom_command(TARGET keepassxc-proxy - POST_BUILD - COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change ${Qt5_PREFIX}/lib/QtNetwork.framework/Versions/5/QtNetwork "@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork" ${PROXY_APP_DIR} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src - COMMENT "Changing linking of keepassxc-proxy QtNetwork") + COMMENT "Changing linking of keepassxc-proxy") endif() endif()