Merge pull request #38 from project-tsurugi/build-fix-rh-rpath

build: fix RPATH settings to work even if libdir is not "lib"
project-tsurugi · Feb 17, 2025 · c434c92 · c434c92
2 parents 2f7274c + 78bc215
commit c434c92
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/examples/cli/CMakeLists.txt b/examples/cli/CMakeLists.txt
@@ -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.
@@ -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"
 )
 

diff --git a/memory/src/CMakeLists.txt b/memory/src/CMakeLists.txt
@@ -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.
@@ -21,7 +21,7 @@ add_library(memory
 
 set_target_properties(memory
     PROPERTIES
-        INSTALL_RPATH "\$ORIGIN/../lib"
+        INSTALL_RPATH "\$ORIGIN"
         LIBRARY_OUTPUT_NAME "sharksfin-memory"
 )
 

diff --git a/shirakami/src/CMakeLists.txt b/shirakami/src/CMakeLists.txt
@@ -12,7 +12,7 @@ add_library(shirakami
 
 set_target_properties(shirakami
         PROPERTIES
-                INSTALL_RPATH "\$ORIGIN/../lib"
+                INSTALL_RPATH "\$ORIGIN"
                 LIBRARY_OUTPUT_NAME "sharksfin-shirakami"
         )