Changeset 14582

Timestamp:

04/15/13 14:58:44 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW added netcdf-cxx interface

File:

• issm/trunk-jpl/etc/environment.sh (modified) (1 diff)

issm/trunk-jpl/etc/environment.sh

@@ -236 +236 @@
 fi
 
-#NETCDF
 NETCDF_DIR="$ISSM_DIR/externalpackages/netcdf/install"
 if [ -d "$NETCDF_DIR" ]; then
-        export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$NETCDF_DIR/lib"
-        export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$NETCDF_DIR/lib"
-        export LIBRARY_PATH="$LIBRARY_PATH:$NETCDF_DIR/lib"
+        dylibpathappend "$NETCDF_DIR/lib"
+        libpathappend "$NETCDF_DIR/lib"
         export C_INCLUDE_PATH="$C_INCLUDE_PATH:$NETCDF_DIR/include"
 fi
 
-#SVN
+NETCDF_CXX_DIR="$ISSM_DIR/externalpackages/netcdf-cxx/install"
+libpathappend "$NETCDF_CXX_DIR/lib"
+
 SVN_DIR="$ISSM_DIR/externalpackages/svn/install"
-if [ -d "$SVN_DIR" ]; then
-        pathprepend   "$SVN_DIR/bin"
-        libpathappend "$SVN_DIR/lib"
-fi
+pathprepend   "$SVN_DIR/bin"
+libpathappend "$SVN_DIR/lib"
 
 APR_DIR="$ISSM_DIR/externalpackages/apr/install"
-if [ -d "$APR_DIR" ]; then
-        pathappend    "$APR_DIR/bin"
-        libpathappend "$APR_DIR/lib"
-fi
+pathappend    "$APR_DIR/bin"
+libpathappend "$APR_DIR/lib"
 
 APR_UTIL_DIR="$ISSM_DIR/externalpackages/apr-util/install"