Skip to content

Commit b275acd

Browse files
committed
Only add relevant directories to sat_solver RUNPATHs
Dito for linear_solve/solve.
1 parent 283756d commit b275acd

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

ortools/linear_solver/CMakeLists.txt

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,22 @@ target_link_libraries(${NAME} PRIVATE
4848
#add_library(${PROJECT_NAME}::linear_solver ALIAS ${NAME})
4949

5050
# solve
51-
include(GNUInstallDirs)
52-
if(APPLE)
53-
set(CMAKE_INSTALL_RPATH
54-
"@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
55-
elseif(UNIX)
56-
set(CMAKE_INSTALL_RPATH
57-
"$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
58-
endif()
59-
6051
add_executable(solve)
6152
target_sources(solve PRIVATE "solve.cc")
6253
target_include_directories(solve PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
6354
target_compile_features(solve PRIVATE cxx_std_17)
6455
target_link_libraries(solve PRIVATE ${PROJECT_NAMESPACE}::ortools)
6556

57+
include(GNUInstallDirs)
58+
if(APPLE)
59+
set_target_properties(solve PROPERTIES INSTALL_RPATH
60+
"@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
61+
elseif(UNIX)
62+
cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR
63+
BASE_DIRECTORY ${CMAKE_INSTALL_FULL_BINDIR}
64+
OUTPUT_VARIABLE libdir_relative_path)
65+
set_target_properties(solve PROPERTIES
66+
INSTALL_RPATH "$ORIGIN/${libdir_relative_path}")
67+
endif()
68+
6669
install(TARGETS solve)

ortools/sat/CMakeLists.txt

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,22 @@ target_link_libraries(${NAME} PRIVATE
4040
#add_library(${PROJECT_NAME}::sat ALIAS ${NAME})
4141

4242
# Sat Runner
43-
include(GNUInstallDirs)
44-
if(APPLE)
45-
set(CMAKE_INSTALL_RPATH
46-
"@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
47-
elseif(UNIX)
48-
set(CMAKE_INSTALL_RPATH
49-
"$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
50-
endif()
51-
5243
add_executable(sat_runner)
5344
target_sources(sat_runner PRIVATE "sat_runner.cc")
5445
target_include_directories(sat_runner PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
5546
target_compile_features(sat_runner PRIVATE cxx_std_17)
5647
target_link_libraries(sat_runner PRIVATE ${PROJECT_NAMESPACE}::ortools)
5748

49+
include(GNUInstallDirs)
50+
if(APPLE)
51+
set_target_properties(sat_runner PROPERTIES INSTALL_RPATH
52+
"@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
53+
elseif(UNIX)
54+
cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR
55+
BASE_DIRECTORY ${CMAKE_INSTALL_FULL_BINDIR}
56+
OUTPUT_VARIABLE libdir_relative_path)
57+
set_target_properties(sat_runner PROPERTIES
58+
INSTALL_RPATH "$ORIGIN/${libdir_relative_path}")
59+
endif()
60+
5861
install(TARGETS sat_runner)

0 commit comments

Comments
 (0)