File 0001-Set-correct-RPATH-for-libraries-and-execut... of Package meshlab

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Set-correct-RPATH-for-libraries-and-executable.patch of Package meshlab

From 0c013510d8a932b73a3b88b95688187edf26b6b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sun, 22 Jan 2023 05:07:13 +0100
Subject: [PATCH] Set correct RPATH for libraries and executable

---
 src/CMakeLists.txt         | 2 +-
 src/common/CMakeLists.txt  | 2 +-
 src/meshlab/CMakeLists.txt | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e9a115..9f64bbd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,7 +72,7 @@ if (USE_DEFAULT_BUILD_AND_INSTALL_DIRS) # otherwise, we assume that all these di
 
 	### Install Settings
 	if (NOT APPLE)
-		set(CMAKE_INSTALL_RPATH $ORIGIN/../${MESHLAB_LIB_INSTALL_DIR};$ORIGIN/../${CMAKE_INSTALL_LIBDIR})
+		set(CMAKE_INSTALL_RPATH $ORIGIN/../${MESHLAB_LIB_INSTALL_DIR})
 	else()
 		SET(CMAKE_INSTALL_RPATH $ORIGIN/../Frameworks)
 	endif()
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index ad1c62a..7b25e5e 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -170,6 +170,6 @@ if(ENABLE_MESHLAB_DEBUG_LOG_FILE)
 endif()
 
 set_target_properties(meshlab-common PROPERTIES
-	INSTALL_RPATH "${MESHLAB_LIB_INSTALL_DIR}:${INSTALL_RPATH}")
+	INSTALL_RPATH "")
 
 install(TARGETS meshlab-common DESTINATION ${MESHLAB_LIB_INSTALL_DIR})
diff --git a/src/meshlab/CMakeLists.txt b/src/meshlab/CMakeLists.txt
index 996cba9..74eb411 100644
--- a/src/meshlab/CMakeLists.txt
+++ b/src/meshlab/CMakeLists.txt
@@ -90,6 +90,7 @@ target_link_libraries(
 	)
 
 set_property(TARGET meshlab PROPERTY FOLDER Core)
+set_property(TARGET meshlab PROPERTY INSTALL_RPATH "$ORIGIN/../${MESHLAB_LIB_INSTALL_DIR}")
 if (APPLE)
 	set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/images/meshlab.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 	file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/images/meshlab.icns DESTINATION "${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Resources/")
-- 
2.39.0

Places

File 0001-Set-correct-RPATH-for-libraries-and-executable.patch of Package meshlab

Places