Skip to content
Snippets Groups Projects
Unverified Commit 6d4f27f3 authored by Amin Bandali's avatar Amin Bandali
Browse files

cmake: always set CMAKE_INSTALL_RPATH_USE_LINK_PATH to true

To help make sure Qt libraries are always in the runpath, even when
building with our own Qt.

Change-Id: Iccae0a6f12d1fe3d478c8cac2d603cc80e244bb2
parent 58c8dd13
No related branches found
Tags
No related merge requests found
...@@ -90,7 +90,6 @@ if(QT5_VER AND QT5_PATH) ...@@ -90,7 +90,6 @@ if(QT5_VER AND QT5_PATH)
find_package(Qt5 ${QT5_VER} find_package(Qt5 ${QT5_VER}
COMPONENTS LinguistTools COMPONENTS LinguistTools
PATHS ${QT5_PATH} NO_DEFAULT_PATH) PATHS ${QT5_PATH} NO_DEFAULT_PATH)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
endif() endif()
else() else()
find_package(Qt5 REQUIRED find_package(Qt5 REQUIRED
...@@ -513,6 +512,8 @@ SET(libringclient_PRIVATE_HDRS ...@@ -513,6 +512,8 @@ SET(libringclient_PRIVATE_HDRS
src/private/videorenderer_p.h src/private/videorenderer_p.h
) )
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
IF(${ENABLE_LIBWRAP} MATCHES true AND ${ENABLE_TEST} MATCHES false) IF(${ENABLE_LIBWRAP} MATCHES true AND ${ENABLE_TEST} MATCHES false)
SET(libringclient_PRIVATE_HDRS SET(libringclient_PRIVATE_HDRS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment