Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-06-16 10:49:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

Don't hardcode install_name_tool change path, resolves #1518

Browse source
This commit is contained in:
Janek Bevendorff 2018-02-21 23:01:02 +01:00
parent 686adbe65a
commit a06a1f84e0
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -298,6 +298,8 @@ if(Qt5Core_VERSION VERSION_LESS "5.2.0")
message(FATAL_ERROR "Qt version 5.2.0 or higher is required") message(FATAL_ERROR "Qt version 5.2.0 or higher is required")
endif() endif()
get_filename_component(Qt5_PREFIX ${Qt5_DIR}/../../.. REALPATH)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)

4
share/translations/CMakeLists.txt
View file

@ -23,12 +23,12 @@ message(STATUS "Including translations...\n")
qt5_add_translation(QM_FILES ${TRANSLATION_FILES}) qt5_add_translation(QM_FILES ${TRANSLATION_FILES})
if(MINGW) if(MINGW)
file(GLOB QTBASE_TRANSLATIONS ${Qt5_DIR}/../../../share/qt5/translations/qtbase_*.qm) file(GLOB QTBASE_TRANSLATIONS ${Qt5_PREFIX}/share/qt5/translations/qtbase_*.qm)
elseif(APPLE OR KEEPASSXC_DIST_APPIMAGE) elseif(APPLE OR KEEPASSXC_DIST_APPIMAGE)
file(GLOB QTBASE_TRANSLATIONS file(GLOB QTBASE_TRANSLATIONS
/usr/share/qt/translations/qtbase_*.qm /usr/share/qt/translations/qtbase_*.qm
/usr/share/qt5/translations/qtbase_*.qm /usr/share/qt5/translations/qtbase_*.qm
${Qt5_DIR}/../../../translations/qtbase_*.qm) ${Qt5_PREFIX}/translations/qtbase_*.qm)
endif() endif()
set(QM_FILES ${QM_FILES} ${QTBASE_TRANSLATIONS}) set(QM_FILES ${QM_FILES} ${QTBASE_TRANSLATIONS})

2
src/CMakeLists.txt
View file

@ -382,7 +382,7 @@ if(MINGW)
include(DeployQt4) include(DeployQt4)
install_qt4_executable(${PROGNAME}.exe) install_qt4_executable(${PROGNAME}.exe)
add_custom_command(TARGET ${PROGNAME} POST_BUILD add_custom_command(TARGET ${PROGNAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${Qt5_DIR}/../../../share/qt5/plugins/platforms/qwindows$<$<CONFIG:Debug>:d>.dll COMMAND ${CMAKE_COMMAND} -E copy_if_different ${Qt5_PREFIX}/share/qt5/plugins/platforms/qwindows$<$<CONFIG:Debug>:d>.dll
$<TARGET_FILE_DIR:${PROGNAME}>) $<TARGET_FILE_DIR:${PROGNAME}>)
install(FILES $<TARGET_FILE_DIR:${PROGNAME}>/qwindows$<$<CONFIG:Debug>:d>.dll DESTINATION "platforms") install(FILES $<TARGET_FILE_DIR:${PROGNAME}>/qwindows$<$<CONFIG:Debug>:d>.dll DESTINATION "platforms")
endif() endif()

4
src/proxy/CMakeLists.txt
View file

@ -42,13 +42,13 @@ if(WITH_XC_BROWSER)
add_custom_command(TARGET keepassxc-proxy add_custom_command(TARGET keepassxc-proxy
POST_BUILD POST_BUILD
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change /usr/local/opt/qt/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" ${PROXY_APP_DIR}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
COMMENT "Changing linking of keepassxc-proxy QtCore") COMMENT "Changing linking of keepassxc-proxy QtCore")
add_custom_command(TARGET keepassxc-proxy add_custom_command(TARGET keepassxc-proxy
POST_BUILD POST_BUILD
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork "@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork" ${PROXY_APP_DIR} 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 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
COMMENT "Changing linking of keepassxc-proxy QtNetwork") COMMENT "Changing linking of keepassxc-proxy QtNetwork")
endif() endif()