Changeset 20338 for issm/trunk-jpl/jenkins/linux64_murdo_ad

Timestamp:

03/24/16 08:46:51 (9 years ago)

Author:

Mathieu Morlighem

Message:

NEW: trying to get rid of MATLAB_DIR, do not use this variable anymore and do NOT install matlab

File:

• issm/trunk-jpl/jenkins/linux64_murdo_ad (modified) (3 diffs)

issm/trunk-jpl/jenkins/linux64_murdo_ad

@@ -3 +3 @@
 # 1: ISSM general configuration #
 #-------------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/matlab80/"
 
 #ISSM CONFIGURATION 
@@ -12 +15 @@
                                 --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
                                 --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
-                                --with-matlab-dir=$MATLAB_DIR \
-                                --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install '
-#MATLAB path
-MATLAB_PATH="/usr/local/matlab80/"
+                                --with-matlab-dir=$MATLAB_PATH 
 
 #PYTHON and MATLAB testing
@@ -44 +44 @@
 EXTERNALPACKAGES="autotools install.sh                
                                          cmake install.sh 
-                                         matlab install.sh 
                                          mpich install-3.0-linux64.sh
                                          petsc install-3.5-linux64.sh