summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-08-28 08:59:03 +0200
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2020-08-28 09:44:18 +0000
commitfde98f7794517adab71e6acdba35039a9c74a4fe (patch)
tree68eca2f50f27331c97f25cc8206816c00876bc72 /cmake
parent09ac1bdfc5d2ee7a537c63e54348a8cf8d905fcf (diff)
CMake: Fix rpath for Qt internal applications (non-bootstrapped tools)
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>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtAppHelpers.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmake/QtAppHelpers.cmake b/cmake/QtAppHelpers.cmake
index 0c99356db3..f0a300b880 100644
--- a/cmake/QtAppHelpers.cmake
+++ b/cmake/QtAppHelpers.cmake
@@ -40,6 +40,10 @@ function(qt_internal_add_app target)
qt_internal_add_target_aliases("${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,
# but don't enable macOS bundles.
# Bundles are enabled in a separate set_target_properties call if an Info.plist file