From 1e69e8d3a9db779ed27e2c3a70670dffcd609988 Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier@jasp.net>
Date: Sun, 17 Apr 2016 19:00:13 +0200
Subject: [PATCH] Find vstbase library at runtime

---
 plugins/VstEffect/CMakeLists.txt | 9 +++++++--
 plugins/vestige/CMakeLists.txt   | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/plugins/VstEffect/CMakeLists.txt b/plugins/VstEffect/CMakeLists.txt
index b842e194c..804022f37 100644
--- a/plugins/VstEffect/CMakeLists.txt
+++ b/plugins/VstEffect/CMakeLists.txt
@@ -1,8 +1,13 @@
 IF(LMMS_SUPPORT_VST)
 INCLUDE(BuildPlugin)
 INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base")
-LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../vst_base")
-LINK_LIBRARIES(vstbase)
+LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/..")
+IF(LMMS_BUILD_WIN32)
+	LINK_LIBRARIES(vstbase)
+ELSE()
+	LINK_LIBRARIES(vstbase -Wl,--enable-new-dtags)
+ENDIF()
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 
 # Enable C++11
 ADD_DEFINITIONS(-std=c++0x)
diff --git a/plugins/vestige/CMakeLists.txt b/plugins/vestige/CMakeLists.txt
index ccc12984d..0c1c9c707 100644
--- a/plugins/vestige/CMakeLists.txt
+++ b/plugins/vestige/CMakeLists.txt
@@ -4,11 +4,13 @@ IF(LMMS_SUPPORT_VST)
 
    INCLUDE(BuildPlugin)
    INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base")
-   LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../vst_base")
-   LINK_LIBRARIES(vstbase)
+   LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/..")
+   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
    IF(LMMS_BUILD_WIN32)
+	LINK_LIBRARIES(vstbase)
 	BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
    ELSE()
+	LINK_LIBRARIES(vstbase -Wl,--enable-new-dtags)
 	BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png" LINK SHARED)
    ENDIF()
 ENDIF(LMMS_SUPPORT_VST)