AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Fix rpath for Qt internal applications (non-bootstrapped tools)

Browse Source 
We need to call qt_apply_rpaths for targets that are created with
qt_internal_add_app too. This is in line with what qt_app.prf does.

Task-number: QTBUG-85399
Change-Id: If5ffb05cca191c6cae9a330e1f4556d342a68ff8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Joerg Bornemann 2020-08-28 08:59:03 +02:00 committed by Assam Boudjelthia
parent 09ac1bdfc5
commit fde98f7794
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtAppHelpers.cmake
View File

@ -40,6 +40,10 @@ function(qt_internal_add_app target)
qt_internal_add_target_aliases("${target}") qt_internal_add_target_aliases("${target}")
_qt_internal_apply_strict_cpp("${target}") _qt_internal_apply_strict_cpp("${target}")
if(NOT arg_NO_INSTALL)
qt_apply_rpaths(TARGET "${target_name}" INSTALL_PATH "${INSTALL_BINDIR}" RELATIVE_RPATH)
endif()
# To mimic the default behaviors of qt_app.prf, we by default enable GUI Windows applications, # To mimic the default behaviors of qt_app.prf, we by default enable GUI Windows applications,
# but don't enable macOS bundles. # but don't enable macOS bundles.
# Bundles are enabled in a separate set_target_properties call if an Info.plist file # Bundles are enabled in a separate set_target_properties call if an Info.plist file