Changeset 20500 for issm/trunk/etc/environment.sh

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• etc/environment.sh (modified) (4 diffs)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

issm/trunk/etc/environment.sh

@@ -96 +96 @@
 
 PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install"
-export PETSC_DIR
-libpathappend "$PETSC_DIR/lib"
+if [ -d "$PETSC_DIR" ]; then
+        export PETSC_DIR
+        libpathappend "$PETSC_DIR/lib"
+fi
 
 SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install"
@@ -282 +284 @@
 libpathappend "$SVN_DIR/lib"
 
+CVS_DIR="$ISSM_DIR/externalpackages/cvs/install"
+pathprepend   "$CVS_DIR/bin"
+
 APR_DIR="$ISSM_DIR/externalpackages/apr/install"
 pathappend    "$APR_DIR/bin"
@@ -312 +317 @@
 libpathprepend   "$ISSM_DIR/externalpackages/expat/install"
 dylibpathprepend   "$ISSM_DIR/externalpackages/expat/install"
+
+#GMSH
+pathappend   "$ISSM_DIR/externalpackages/gmsh/install"
 
 #CURL
@@ -317 +325 @@
 dylibpathprepend   "$ISSM_DIR/externalpackages/curl/install/lib"
 pathprepend "$ISSM_DIR/externalpackages/curl/install/bin"
+
+#GMT
+pathprepend "$ISSM_DIR/externalpackages/gmt/install/bin"

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad