In clairvars.sh set all relevant environment variables

flatironinstitute · Sep 20, 2024 · 6498abe · 6498abe
1 parent 19aa9d1
commit 6498abe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git 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
@@ -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