build: fix RPATH settings to work even if libdir is not "lib"

project-tsurugi · Feb 17, 2025 · 32247fa · 32247fa
1 parent fd3a1c3
commit 32247fa
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/examples/task_scheduler_cli/CMakeLists.txt b/examples/task_scheduler_cli/CMakeLists.txt
@@ -8,7 +8,7 @@ add_executable(task-scheduler-cli
 
 set_target_properties(task-scheduler-cli
         PROPERTIES
-                INSTALL_RPATH "\$ORIGIN/../lib"
+                INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}"
                 RUNTIME_OUTPUT_NAME "task-scheduler-cli"
 )
 

diff --git a/examples/thread_affinity_cli/CMakeLists.txt b/examples/thread_affinity_cli/CMakeLists.txt
@@ -8,7 +8,7 @@ add_executable(thread-affinity-cli
 
 set_target_properties(thread-affinity-cli
         PROPERTIES
-                INSTALL_RPATH "\$ORIGIN/../lib"
+                INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}"
                 RUNTIME_OUTPUT_NAME "cli"
 )
 

diff --git a/mock/CMakeLists.txt b/mock/CMakeLists.txt
@@ -35,7 +35,7 @@ add_dependencies(mock_server
 
 set_target_properties(mock_server
         PROPERTIES
-                INSTALL_RPATH "\$ORIGIN"
+                INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}"
                 RUNTIME_OUTPUT_NAME "mock_server"
         )
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -85,7 +85,7 @@ add_dependencies(${ENGINE}
 
 set_target_properties(${ENGINE}
         PROPERTIES
-                INSTALL_RPATH "\$ORIGIN/../lib"
+                INSTALL_RPATH "\$ORIGIN"
                 OUTPUT_NAME ${export_name}
 )