summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-08-30 17:58:36 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-30 21:52:29 +0000
commit7ba87489eed4acce903bc10ec14162c426641bd9 (patch)
tree70388045b23f60db13133d70ad61cec939790310
parentcd1ddd3450e2e9d708cecd814cc356a44fe0282a (diff)
Set right RUNPATH for QtWebEngineProcess
Call qt_apply_rpath like for Qt tools or apps. Fixes: QTBUG-96093 Change-Id: I22c670ede70ba52d1255bb362519d152a227f5f3 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 9b47a27441a3a80e2c45bd69334c4236f90865bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/process/CMakeLists.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/process/CMakeLists.txt b/src/process/CMakeLists.txt
index 5e7c1130b..6d00db123 100644
--- a/src/process/CMakeLists.txt
+++ b/src/process/CMakeLists.txt
@@ -22,11 +22,11 @@ if(WIN32)
target_link_options(${qtWebEngineProcessName} PRIVATE "@${libs_rsp}")
endif()
-target_link_libraries(${qtWebEngineProcessName}
- PUBLIC
+qt_internal_extend_target(${qtWebEngineProcessName}
+ PUBLIC_LIBRARIES
Qt::Gui
Qt::WebEngineCore
- PRIVATE
+ LIBRARIES
Qt::CorePrivate
Qt::WebEngineCorePrivate
)
@@ -45,6 +45,8 @@ if(QT_FEATURE_debug_and_release)
OUTPUT_NAME_DEBUG ${qtWebEngineProcessName}${CMAKE_DEBUG_POSTFIX})
endif()
+qt_apply_rpaths(TARGET ${qtWebEngineProcessName} INSTALL_PATH "${INSTALL_LIBEXECDIR}" RELATIVE_RPATH)
+
if(isFramework)
set_target_properties(${qtWebEngineProcessName} PROPERTIES MACOSX_BUNDLE TRUE)
target_sources(${qtWebEngineProcessName} PRIVATE QtWebEngineProcess.entitlements)