Changeset 19619

Timestamp:

10/02/15 14:56:19 (10 years ago)

Author:

glperez

Message:

CHG: Minor changes to Windows parallel build to update paths.

File:

• issm/trunk-jpl/jenkins/windows-par (modified) (1 diff)

issm/trunk-jpl/jenkins/windows-par

@@ -12 +12 @@
         --without-Gia \
         --without-kriging \
-        --with-matlab-dir=""$ISSM_DIR/externalpackages/matlab/install"" \
+        --with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
         --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
         --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/  \
-        --with-mpi-include="C:/Programs/MPICH2/include" \
-        --with-mpi-libflags="-Wl,mpi.lib -Wl,-L/cygdrive/c/Programs/MPICH2/lib" \
+        --with-mpi-include="/cygdrive/c/Programs/MPICH2/include" \
+        --with-mpi-libflags="-Wl,mpi.lib -Wl,/LIBPATH:C:/Programs/MPICH2/lib" \
         --enable-development \
         --enable-debugging '
 
 #MATLAB path
-MATLAB_PATH="C:/MATLAB/R2013a/"
+MATLAB_PATH="/cygdrive/c/Programs/MATLAB/R2015a/"
 
 #PYTHON and MATLAB testing