Skip to content

Commit

Permalink
Merge pull request #259 from project-tsurugi/build-fix-rh-rpath
Browse files Browse the repository at this point in the history
build: fix RPATH settings to work even if libdir is not "lib"
  • Loading branch information
t-horikawa authored Feb 18, 2025
2 parents fd3a1c3 + 32247fa commit 80f0b52
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion examples/task_scheduler_cli/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

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

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

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

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

Expand Down

0 comments on commit 80f0b52

Please sign in to comment.