Fix Linux INSTALL_RPATHs.

KhronosGroup · Sep 14, 2024 · 757da79 · 757da79
1 parent dda210d
commit 757da79
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -9,7 +9,7 @@ function(set_test_properties test_target)
         )
     elseif(LINUX)
         set_target_properties(${test_target} PROPERTIES
-            INSTALL_RPATH "$ORIGIN;$ORIGIN/../lib"
+            INSTALL_RPATH "\$ORIGIN;\$ORIGIN/../lib"
         )
     endif()
 endfunction()

diff --git a/tests/loadtests/glloadtests.cmake b/tests/loadtests/glloadtests.cmake
@@ -273,7 +273,7 @@ function( create_gl_target target version sources common_resources test_images
         # /usr/local/bin.
 
         set_target_properties( ${target} PROPERTIES
-            INSTALL_RPATH "\$ORIGIN:${CMAKE_INSTALL_FULL_LIBDIR}"
+            INSTALL_RPATH "\$ORIGIN;${CMAKE_INSTALL_FULL_LIBDIR}"
         )
 
         ######### IMPORTANT ######

diff --git a/tests/loadtests/vkloadtests.cmake b/tests/loadtests/vkloadtests.cmake
@@ -372,7 +372,7 @@ else()
     # /usr/local/bin.
 
     set_target_properties( vkloadtests PROPERTIES
-        INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}"
+        INSTALL_RPATH "\$ORIGIN;${CMAKE_INSTALL_FULL_LIBDIR}"
     )
 
     ######### IMPORTANT ######

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -42,7 +42,7 @@ function(set_tool_properties tool_target)
             # Check DT_RUNPATH with one of
             # - readelf -d <file> | head -20
             # - objdump -x <file> | grep 'R.*PATH'
-            INSTALL_RPATH "$ORIGIN;$ORIGIN/../lib"
+            INSTALL_RPATH "\$ORIGIN;${CMAKE_INSTALL_FULL_LIBDIR}"
         )
     endif()
 endfunction()