From 6498abec50963659ba6112fd72392d22c6524f0a Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Fri, 20 Sep 2024 10:13:06 -0400 Subject: [PATCH] In clairvars.sh set all relevant environment variables --- share/CMakeLists.txt | 6 ------ share/clairvars.sh.in | 11 ++++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt index 810bba7..4c0914c 100644 --- a/share/CMakeLists.txt +++ b/share/CMakeLists.txt @@ -5,12 +5,6 @@ if(NOT IS_SUBPROJECT AND NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr/local" ) - if(CMAKE_SYSTEM_NAME MATCHES "Darwin") - set(LD_LIBRARY_PATH_PREFIX "DYLD") - else() - set(LD_LIBRARY_PATH_PREFIX "LD") - endif() - configure_file(clair.modulefile.in ${PROJECT_NAME}.modulefile @ONLY) configure_file(clairvars.sh.in ${PROJECT_NAME}vars.sh @ONLY) diff --git a/share/clairvars.sh.in b/share/clairvars.sh.in index 82d6698..9af26a5 100644 --- a/share/clairvars.sh.in +++ b/share/clairvars.sh.in @@ -1,8 +1,9 @@ # Source this in your environment. -#export CPLUS_INCLUDE_PATH=@CMAKE_INSTALL_PREFIX@/include:$CPLUS_INCLUDE_PATH -#export PATH=@CMAKE_INSTALL_PREFIX@/bin:$PATH -export @LD_LIBRARY_PATH_PREFIX@_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$@LD_LIBRARY_PATH_PREFIX@_LIBRARY_PATH -#export LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LIBRARY_PATH +export CPLUS_INCLUDE_PATH=@CMAKE_INSTALL_PREFIX@/include:$CPLUS_INCLUDE_PATH +export PATH=@CMAKE_INSTALL_PREFIX@/bin:$PATH +export LIBRARY_PATH=@CMAKE_INSTALL_FULL_LIBDIR@:$LIBRARY_PATH +export LD_LIBRARY_PATH=@CMAKE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=@CMAKE_INSTALL_FULL_LIBDIR@:$DYLD_LIBRARY_PATH export PYTHONPATH=@CMAKE_INSTALL_PREFIX@/@PYTHON_LIB_DEST_ROOT@:$PYTHONPATH -export CMAKE_PREFIX_PATH=@CMAKE_INSTALL_PREFIX@/lib/cmake/clair:$CMAKE_PREFIX_PATH +export CMAKE_PREFIX_PATH=@CMAKE_INSTALL_PREFIX@:$CMAKE_PREFIX_PATH