Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Feb 17, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/aggregate_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/client_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/cogroup_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/group_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/join_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/mock_aggregate_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/process_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/query_bench_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/scan_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/service_benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/service_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/sql_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion mock/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ add_dependencies(${ENGINE}

set_target_properties(${ENGINE}
PROPERTIES
INSTALL_RPATH "\$ORIGIN/../lib"
INSTALL_RPATH "\$ORIGIN"
OUTPUT_NAME ${export_name}
)

Expand Down