diff --git a/CMakeLists.txt b/CMakeLists.txt index c49facb44fdec435425a1792bc029a59bf5bbfee..fe4828f7d3ec2cbaca3bf7216664f445902722f3 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 1d9bbf6c3eae543545631dbcf368867de9e666c1..97582781ee88e10a8671de39b5d5b4f61486e803 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 c10e22067aabc65585d34b8384884a7968113e02..c412ecdc064bdcd0c6f12a6df35737da29cee5b4 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%?}