File 0001-Fix-install-rpaths.patch of Package renderdoc

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-install-rpaths.patch of Package renderdoc (Revision 38590150e0cff1df6dad777c2feb8a60)

Currently displaying revision 38590150e0cff1df6dad777c2feb8a60 , Show latest

From 6144c10c98340a36832ecb52ebd9efbd07a69189 Mon Sep 17 00:00:00 2001
From: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Date: Mon, 15 Aug 2022 10:21:17 +0200
Subject: [PATCH] Fix install rpaths

Signed-off-by: Patrik Jakobsson <pjakobsson@suse.de>
---
 qrenderdoc/qrenderdoc.pro   | 2 +-
 renderdoccmd/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro
index dc2de53..964b68d 100644
--- a/qrenderdoc/qrenderdoc.pro
+++ b/qrenderdoc/qrenderdoc.pro
@@ -124,7 +124,7 @@ win32 {
 
 	# Link against the core library
 	LIBS += -lrenderdoc
-	QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN\',-rpath,\'\$$ORIGIN/../lib'$$LIB_SUFFIX'/'$$LIB_SUBFOLDER_TRAIL_SLASH'\''
+	set(CMAKE_INSTALL_RPATH "$ORIGIN/:$ORIGIN/../lib${LIB_SUFFIX}/${LIB_SUBFOLDER_TRAIL_SLASH}")
 
 	# Add the SWIG files that were generated in cmake
 	SOURCES += $$CMAKE_DIR/qrenderdoc/renderdoc_python.cxx
diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt
index 1f0173d..e9b8f10 100644
--- a/renderdoccmd/CMakeLists.txt
+++ b/renderdoccmd/CMakeLists.txt
@@ -69,7 +69,7 @@ else()
         set(CMAKE_MACOSX_RPATH TRUE)
         set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
     else()
-        set(CMAKE_INSTALL_RPATH "$ORIGIN/:$ORIGIN/../lib${LIB_SUFFIX}/${LIB_SUBFOLDER_TRAIL_SLASH}")
+        set(CMAKE_INSTALL_RPATH "")
     endif()
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}")
 
-- 
2.37.1

Places

File 0001-Fix-install-rpaths.patch of Package renderdoc (Revision 38590150e0cff1df6dad777c2feb8a60)

Places