From 974473aff712988a7c613942679e7ab906148beb Mon Sep 17 00:00:00 2001 From: Robert Taylor Date: Sat, 10 Dec 2022 17:10:14 +0000 Subject: [PATCH] fix rpaths - really didn't need quoting --- bootstrap/cmake_modules/FindBootstrap.cmake | 1 + build.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrap/cmake_modules/FindBootstrap.cmake b/bootstrap/cmake_modules/FindBootstrap.cmake index a8b7e7b7..d0a50310 100644 --- a/bootstrap/cmake_modules/FindBootstrap.cmake +++ b/bootstrap/cmake_modules/FindBootstrap.cmake @@ -10,6 +10,7 @@ cmake_policy(SET CMP0079 NEW) cmake_policy(SET CMP0022 NEW) cmake_policy(SET CMP0060 NEW) + cmake_policy(SET CMP0095 NEW) #if(NOT (CMAKE_VERSION VERSION_LESS 2.8.0)) # cmake_policy(SET CMP0014 OLD) #endif() diff --git a/build.py b/build.py index 5fdf524b..e019fe98 100644 --- a/build.py +++ b/build.py @@ -91,7 +91,7 @@ class ExtensionBuilder(build_ext): cmake_args += ["-DCMAKE_BUILD_RPATH_USE_ORIGIN=1"] cmake_args += ["-DCMAKE_SKIP_BUILD_RPATH=FALSE"] cmake_args += ["-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"] - cmake_args += ["-DCMAKE_INSTALL_RPATH=\${ORIGIN}/lib:\${ORIGIN}"] + cmake_args += ["-DCMAKE_INSTALL_RPATH='$ORIGIN/lib:$ORIGIN'"] cmake_args += ["-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE"] subprocess.check_call(["cmake", "--debug-find", "--trace-redirect=build.cmake.trace", "--trace-expand", ext.sourcedir] + cmake_args, cwd=build_dir, env=env) @@ -105,7 +105,7 @@ class ExtensionBuilder(build_ext): if 'ELF' in line: #TODO support other OSs f = line.split(':')[0] print(f"fixing up {f}") - subprocess.check_call(["patchelf", "--set-rpath", '${ORIGIN}/../../lib', f]) + subprocess.check_call(["patchelf", "--set-rpath", '$ORIGIN/../../lib', f]) def build(setup_kwargs: Dict[str, Any]) -> None: cmake_modules = [