Skip to content

Commit

Permalink
CMake: Fix rpath for Qt internal applications (non-bootstrapped tools)
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
jobor authored and Issam-b committed Aug 28, 2020
1 parent 09ac1bd commit fde98f7
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions cmake/QtAppHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fde98f7

Please sign in to comment.