Merge branch 'bugfix/rpath' into 'master'

reintroducing LD_LIBRARY_PATH

See merge request !58

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

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

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%?}