From a1424d0afb661f8f2e9106e36a43334f2d0d4bee Mon Sep 17 00:00:00 2001 From: Bertrand Rix Date: Wed, 7 Aug 2024 14:00:44 +0200 Subject: [PATCH] Setup rpath correctly, to make build_tarball work without auditing. Signed-off-by: Bertrand Rix --- cpp/powsybljl-cpp/CMakeLists.txt | 2 +- cpp/pypowsybl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/powsybljl-cpp/CMakeLists.txt b/cpp/powsybljl-cpp/CMakeLists.txt index 112a494..9947438 100644 --- a/cpp/powsybljl-cpp/CMakeLists.txt +++ b/cpp/powsybljl-cpp/CMakeLists.txt @@ -4,12 +4,12 @@ project(PowsyblJlWrap) set(CMAKE_MACOSX_RPATH 1) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_INSTALL_RPATH "$ORIGIN/") #---Find JlCxx package------------------------------------------------------------- find_package(JlCxx) get_target_property(JlCxx_location JlCxx::cxxwrap_julia LOCATION) get_filename_component(JlCxx_location ${JlCxx_location} DIRECTORY) -set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${JlCxx_location}") message(STATUS "Found JlCxx at ${JlCxx_location}") set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE) diff --git a/cpp/pypowsybl b/cpp/pypowsybl index ccdb6d6..eafe449 160000 --- a/cpp/pypowsybl +++ b/cpp/pypowsybl @@ -1 +1 @@ -Subproject commit ccdb6d6d1e15b4e15ecd0146d8ac9fee285c0778 +Subproject commit eafe449f246343b5d9aedb9eb2e2757cd9dd76e1