From 6b79812190beef700d288ebbc0963205899d0216 Mon Sep 17 00:00:00 2001 From: Nobuhiro Ban Date: Fri, 14 Feb 2025 20:09:56 +0900 Subject: [PATCH] build: fix RPATH settings to work even if libdir is not "lib" --- examples/aggregate_cli/CMakeLists.txt | 2 +- examples/client_cli/CMakeLists.txt | 2 +- examples/cogroup_cli/CMakeLists.txt | 2 +- examples/group_cli/CMakeLists.txt | 2 +- examples/join_cli/CMakeLists.txt | 2 +- examples/mock_aggregate_cli/CMakeLists.txt | 2 +- examples/process_cli/CMakeLists.txt | 2 +- examples/query_bench_cli/CMakeLists.txt | 2 +- examples/scan_cli/CMakeLists.txt | 2 +- examples/service_benchmark/CMakeLists.txt | 2 +- examples/service_cli/CMakeLists.txt | 2 +- examples/sql_cli/CMakeLists.txt | 2 +- mock/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/aggregate_cli/CMakeLists.txt b/examples/aggregate_cli/CMakeLists.txt index 58c66ce0..ee4c7770 100644 --- a/examples/aggregate_cli/CMakeLists.txt +++ b/examples/aggregate_cli/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(aggregate-cli set_target_properties(aggregate-cli PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" RUNTIME_OUTPUT_NAME "aggregate-cli" ) diff --git a/examples/client_cli/CMakeLists.txt b/examples/client_cli/CMakeLists.txt index ce355856..cab1d6e6 100644 --- a/examples/client_cli/CMakeLists.txt +++ b/examples/client_cli/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable(client-cli set_target_properties(client-cli PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" RUNTIME_OUTPUT_NAME "client-cli" ) diff --git a/examples/cogroup_cli/CMakeLists.txt b/examples/cogroup_cli/CMakeLists.txt index 893d0bcb..0f803b3f 100644 --- a/examples/cogroup_cli/CMakeLists.txt +++ b/examples/cogroup_cli/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(cogroup-cli set_target_properties(cogroup-cli PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" RUNTIME_OUTPUT_NAME "cogroup-cli" ) diff --git a/examples/group_cli/CMakeLists.txt b/examples/group_cli/CMakeLists.txt index ac36db1d..85b25a72 100644 --- a/examples/group_cli/CMakeLists.txt +++ b/examples/group_cli/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(group-cli set_target_properties(group-cli PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" RUNTIME_OUTPUT_NAME "group-cli" ) diff --git a/examples/join_cli/CMakeLists.txt b/examples/join_cli/CMakeLists.txt index f57f2e80..2e067bd8 100644 --- a/examples/join_cli/CMakeLists.txt +++ b/examples/join_cli/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(join-cli set_target_properties(join-cli PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" RUNTIME_OUTPUT_NAME "join-cli" ) diff --git a/examples/mock_aggregate_cli/CMakeLists.txt b/examples/mock_aggregate_cli/CMakeLists.txt index f7670e17..117b1f9b 100644 --- a/examples/mock_aggregate_cli/CMakeLists.txt +++ b/examples/mock_aggregate_cli/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(mock-aggregate-cli set_target_properties(mock-aggregate-cli PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" RUNTIME_OUTPUT_NAME "mock-aggregate-cli" ) diff --git a/examples/process_cli/CMakeLists.txt b/examples/process_cli/CMakeLists.txt index 0d23e93e..54836501 100644 --- a/examples/process_cli/CMakeLists.txt +++ b/examples/process_cli/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable(process-cli set_target_properties(process-cli PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" RUNTIME_OUTPUT_NAME "process-cli" ) diff --git a/examples/query_bench_cli/CMakeLists.txt b/examples/query_bench_cli/CMakeLists.txt index 96ba47e7..aafeb3ce 100644 --- a/examples/query_bench_cli/CMakeLists.txt +++ b/examples/query_bench_cli/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable(query-bench-cli set_target_properties(query-bench-cli PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" RUNTIME_OUTPUT_NAME "query-bench-cli" ) diff --git a/examples/scan_cli/CMakeLists.txt b/examples/scan_cli/CMakeLists.txt index e5b10510..431552cb 100644 --- a/examples/scan_cli/CMakeLists.txt +++ b/examples/scan_cli/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable(scan-cli set_target_properties(scan-cli PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" RUNTIME_OUTPUT_NAME "scan-cli" ) diff --git a/examples/service_benchmark/CMakeLists.txt b/examples/service_benchmark/CMakeLists.txt index 89b995c5..eabf23eb 100644 --- a/examples/service_benchmark/CMakeLists.txt +++ b/examples/service_benchmark/CMakeLists.txt @@ -15,7 +15,7 @@ add_executable(service-benchmark set_target_properties(service-benchmark PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" RUNTIME_OUTPUT_NAME "cli" ) diff --git a/examples/service_cli/CMakeLists.txt b/examples/service_cli/CMakeLists.txt index 8a41e7af..a3e37063 100644 --- a/examples/service_cli/CMakeLists.txt +++ b/examples/service_cli/CMakeLists.txt @@ -16,7 +16,7 @@ add_executable(service-cli set_target_properties(service-cli PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" RUNTIME_OUTPUT_NAME "cli" ) diff --git a/examples/sql_cli/CMakeLists.txt b/examples/sql_cli/CMakeLists.txt index ff1314c3..25c1f47d 100644 --- a/examples/sql_cli/CMakeLists.txt +++ b/examples/sql_cli/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable(sql-cli set_target_properties(sql-cli PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" RUNTIME_OUTPUT_NAME "sql-cli" ) diff --git a/mock/CMakeLists.txt b/mock/CMakeLists.txt index 779f98b2..e8a6a93c 100644 --- a/mock/CMakeLists.txt +++ b/mock/CMakeLists.txt @@ -22,7 +22,7 @@ target_include_directories(common set_target_properties(common PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN" OUTPUT_NAME jogasaki-common-utils ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2bf95042..5a3b4d81 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -138,7 +138,7 @@ add_dependencies(${ENGINE} set_target_properties(${ENGINE} PROPERTIES - INSTALL_RPATH "\$ORIGIN/../lib" + INSTALL_RPATH "\$ORIGIN" OUTPUT_NAME ${export_name} )