From 3d26b2e2e5203363e36bc724cfe4bafd2a3f73dc Mon Sep 17 00:00:00 2001
From: "Patrick L.S. Connor" <patrick.connor@cern.ch>
Date: Thu, 20 Mar 2025 21:08:18 +0100
Subject: [PATCH] reintroducing LD_LIBRARY_PATH
---
CMakeLists.txt | 2 +-
scripts/detect_environment.py | 5 +----
scripts/setup.sh.in | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c49facb..fe4828f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ include(ExternalProject)
include(GNUInstallDirs)
# Detect the user's environment.
-execute_process(COMMAND "${Python_EXECUTABLE}" scripts/detect_environment.py "${CMAKE_INSTALL_FULL_LIBDIR}"
+execute_process(COMMAND "${Python_EXECUTABLE}" scripts/detect_environment.py
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
OUTPUT_VARIABLE ENVIRONMENT_SETUP
OUTPUT_STRIP_TRAILING_WHITESPACE
diff --git a/scripts/detect_environment.py b/scripts/detect_environment.py
index 1d9bbf6..9758278 100644
--- a/scripts/detect_environment.py
+++ b/scripts/detect_environment.py
@@ -45,8 +45,6 @@ unset __mamba_setup
# Enable the environment
{mamba_exe_name} activate '{env_name}'
-
-export LD_LIBRARY_PATH={LD_LIBRARY_PATH}
'''
mamba_exe = os.environ['MAMBA_EXE']
mamba_root = os.environ['MAMBA_ROOT_PREFIX']
@@ -54,8 +52,7 @@ export LD_LIBRARY_PATH={LD_LIBRARY_PATH}
return template.format(mamba_exe=mamba_exe,
mamba_root=mamba_root,
mamba_exe_name=mamba_exe_name,
- env_name=env_name,
- LD_LIBRARY_PATH="{}:$LD_LIBRARY_PATH".format(quote(sys.argv[1])))
+ env_name=env_name)
elif 'CONDA_EXE' in os.environ:
template = '''
# Make sure conda is set up
diff --git a/scripts/setup.sh.in b/scripts/setup.sh.in
index c10e220..c412ecd 100644
--- a/scripts/setup.sh.in
+++ b/scripts/setup.sh.in
@@ -3,7 +3,7 @@
# Technically needed
export PATH=@CMAKE_INSTALL_FULL_BINDIR@:$PATH
export PYTHONPATH=@CMAKE_INSTALL_PREFIX@/python:$PYTHONPATH
-export LD_LIBRARY_PATH=$(correction config --libdir):$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=@CMAKE_INSTALL_FULL_LIBDIR@:$(correction config --libdir):$LD_LIBRARY_PATH
if [[ "${LD_LIBRARY_PATH: -1}" = ":" ]]
then
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH%?}
--
GitLab