From 831ab24e49f3377f61009e8d8c30560cc2ad6627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 2 Feb 2022 20:11:32 +0100 Subject: [PATCH] package/ci: I wonder how this RPATH mess ever worked. WTH. --- package/ci/unix-desktop-gles.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ci/unix-desktop-gles.sh b/package/ci/unix-desktop-gles.sh index 3ddafec..60bd054 100755 --- a/package/ci/unix-desktop-gles.sh +++ b/package/ci/unix-desktop-gles.sh @@ -23,11 +23,10 @@ cd magnum mkdir build && cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ - -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_DEPRECATED=OFF \ -DCMAKE_PREFIX_PATH="$HOME/swiftshader;$HOME/pybind11" \ - -DCMAKE_INSTALL_RPATH=$HOME/swiftshader/lib \ + -DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \ -DTARGET_GLES=ON \ -DTARGET_GLES2=$TARGET_GLES2 \ -DWITH_AUDIO=OFF \ @@ -72,7 +71,7 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_PREFIX_PATH="$HOME/swiftshader;$HOME/pybind11" \ - -DCMAKE_INSTALL_RPATH=$HOME/swiftshader/lib \ + -DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \ -DPYBIND11_PYTHON_VERSION=3.6 \ -DWITH_PYTHON=ON \ -DBUILD_TESTS=ON \