Add $ORIGIN/../lib/ to rpath for renderdoccmd and qrenderdoc

baldurk · baldurk · commit 7caf12aea4b8 · 2017-02-10T12:09:05.000Z
diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro
@@ -80,7 +80,7 @@ win32 {
 
 	# Link against the core library
 	LIBS += -L$$DESTDIR -lrenderdoc
-	QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN\''
+	QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN\',-rpath,\'\$$ORIGIN/../lib\''
 
 	CONFIG += warn_off
 	CONFIG += c++11
diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt
@@ -35,7 +35,7 @@ if(ANDROID)
 else()
     set(CMAKE_SKIP_BUILD_RPATH TRUE)
     set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-    set(CMAKE_INSTALL_RPATH "$ORIGIN/")
+    set(CMAKE_INSTALL_RPATH "$ORIGIN/:$ORIGIN/../lib/")
 
     add_executable(renderdoccmd ${sources})
 endif()
