From 757da79fcf24311f96ebbbdb760732200a69501b Mon Sep 17 00:00:00 2001
From: Mark Callow <github@callow.im>
Date: Sat, 14 Sep 2024 20:38:29 +0900
Subject: [PATCH] Fix Linux INSTALL_RPATHs.

---
 tests/CMakeLists.txt              | 2 +-
 tests/loadtests/glloadtests.cmake | 2 +-
 tests/loadtests/vkloadtests.cmake | 2 +-
 tools/CMakeLists.txt              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1d4c2d690e..ae48f2e8d7 100644
--- 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
index b2d826360e..4040bf61cf 100644
--- 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
index c0fdac8066..86615b7288 100644
--- 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
index ffc1e365dd..c2387bbd61 100644
--- 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()