File 0003-Only-add-relevant-directories-to-sat_solve... of Package google-or-tools

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Only-add-relevant-directories-to-sat_solver-RUNPATHs.patch of Package google-or-tools

From b275acd957455185783c484645ceb4c1921cfc3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Thu, 11 May 2023 02:55:33 +0200
Subject: [PATCH 3/3] Only add relevant directories to sat_solver RUNPATHs

Dito for linear_solve/solve.
---
 ortools/linear_solver/CMakeLists.txt | 21 ++++++++++++---------
 ortools/sat/CMakeLists.txt           | 21 ++++++++++++---------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/ortools/linear_solver/CMakeLists.txt b/ortools/linear_solver/CMakeLists.txt
index f0ccb04182..c5b54cae0f 100644
--- a/ortools/linear_solver/CMakeLists.txt
+++ b/ortools/linear_solver/CMakeLists.txt
@@ -48,19 +48,22 @@ target_link_libraries(${NAME} PRIVATE
 #add_library(${PROJECT_NAME}::linear_solver ALIAS ${NAME})
 
 # solve
-include(GNUInstallDirs)
-if(APPLE)
-  set(CMAKE_INSTALL_RPATH
-    "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
-elseif(UNIX)
-  set(CMAKE_INSTALL_RPATH
-    "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
-endif()
-
 add_executable(solve)
 target_sources(solve PRIVATE "solve.cc")
 target_include_directories(solve PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_compile_features(solve PRIVATE cxx_std_17)
 target_link_libraries(solve PRIVATE ${PROJECT_NAMESPACE}::ortools)
 
+include(GNUInstallDirs)
+if(APPLE)
+  set_target_properties(solve PROPERTIES INSTALL_RPATH
+    "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
+elseif(UNIX)
+  cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR
+             BASE_DIRECTORY ${CMAKE_INSTALL_FULL_BINDIR}
+             OUTPUT_VARIABLE libdir_relative_path)
+  set_target_properties(solve PROPERTIES
+                        INSTALL_RPATH "$ORIGIN/${libdir_relative_path}")
+endif()
+
 install(TARGETS solve)
diff --git a/ortools/sat/CMakeLists.txt b/ortools/sat/CMakeLists.txt
index 19bd83f738..aec4bec3f3 100644
--- a/ortools/sat/CMakeLists.txt
+++ b/ortools/sat/CMakeLists.txt
@@ -40,19 +40,22 @@ target_link_libraries(${NAME} PRIVATE
 #add_library(${PROJECT_NAME}::sat ALIAS ${NAME})
 
 # Sat Runner
-include(GNUInstallDirs)
-if(APPLE)
-  set(CMAKE_INSTALL_RPATH
-    "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
-elseif(UNIX)
-  set(CMAKE_INSTALL_RPATH
-    "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
-endif()
-
 add_executable(sat_runner)
 target_sources(sat_runner PRIVATE "sat_runner.cc")
 target_include_directories(sat_runner PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_compile_features(sat_runner PRIVATE cxx_std_17)
 target_link_libraries(sat_runner PRIVATE ${PROJECT_NAMESPACE}::ortools)
 
+include(GNUInstallDirs)
+if(APPLE)
+  set_target_properties(sat_runner PROPERTIES INSTALL_RPATH
+    "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
+elseif(UNIX)
+  cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR
+             BASE_DIRECTORY ${CMAKE_INSTALL_FULL_BINDIR}
+             OUTPUT_VARIABLE libdir_relative_path)
+  set_target_properties(sat_runner PROPERTIES
+                        INSTALL_RPATH "$ORIGIN/${libdir_relative_path}")
+endif()
+
 install(TARGETS sat_runner)
-- 
2.40.1

Places

File 0003-Only-add-relevant-directories-to-sat_solver-RUNPATHs.patch of Package google-or-tools

Places