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.

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" #38

Merged
merged 1 commit into from
Feb 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions examples/cli/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2018-2023 Project Tsurugi.
# Copyright 2018-2025 Project Tsurugi.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -25,7 +25,7 @@ add_executable(cli

set_target_properties(cli
PROPERTIES
INSTALL_RPATH "\$ORIGIN/../lib"
INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}"
RUNTIME_OUTPUT_NAME "sharksfin-cli"
)

Expand Down
4 changes: 2 additions & 2 deletions memory/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2018-2023 Project Tsurugi.
# Copyright 2018-2025 Project Tsurugi.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@ add_library(memory

set_target_properties(memory
PROPERTIES
INSTALL_RPATH "\$ORIGIN/../lib"
INSTALL_RPATH "\$ORIGIN"
LIBRARY_OUTPUT_NAME "sharksfin-memory"
)

Expand Down
2 changes: 1 addition & 1 deletion shirakami/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ add_library(shirakami

set_target_properties(shirakami
PROPERTIES
INSTALL_RPATH "\$ORIGIN/../lib"
INSTALL_RPATH "\$ORIGIN"
LIBRARY_OUTPUT_NAME "sharksfin-shirakami"
)

Expand Down