From 8c01ba0dc31c501719dfad10d35d8e20320f58cb Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier@jasp.net>
Date: Wed, 18 May 2016 22:07:52 +0200
Subject: [PATCH] Fixed handling RPATH for alternate version of Qt

---
 plugins/zynaddsubfx/CMakeLists.txt | 7 +++----
 src/CMakeLists.txt                 | 7 +++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
index 1b01f4450..3ac4f8489 100644
--- a/plugins/zynaddsubfx/CMakeLists.txt
+++ b/plugins/zynaddsubfx/CMakeLists.txt
@@ -161,10 +161,9 @@ IF(WIN32)
 				DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfx.rc")
 ENDIF(WIN32)
 
-IF(NOT LMMS_BUILD_LINUX)
-	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
-	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-ENDIF()
+# Use libraries in non-standard directories (e.g., another version of Qt)
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
 ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp "${WINRC}")
 INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION "${PLUGIN_DIR}")
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 24cedbfd0..10bdb73a5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,6 +72,13 @@ IF(NOT ("${OGGVORBIS_INCLUDE_DIR}" STREQUAL ""))
 	INCLUDE_DIRECTORIES("${OGGVORBIS_INCLUDE_DIR}")
 ENDIF()
 
+# Use libraries in non-standard directories (e.g., another version of Qt)
+IF(LMMS_BUILD_LINUX)
+	LINK_LIBRARIES(-Wl,--enable-new-dtags)
+	SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ENDIF()
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
 # ADD_LIBRARY's OBJECT is only supported in CMake >=2.8.8
 IF(CMAKE_VERSION VERSION_GREATER "2.8.7")