Changeset 23343

Timestamp:

09/26/18 23:10:47 (6 years ago)

Author:

jdquinn

Message:

CHG: Attempt at fixing Mac binaries gmsh issue (cannot get a reliable build going on High Sierra, so will have to test on Jenkins)

Location:

issm/trunk

Files:

• externalpackages/gmsh/install-static.sh (modified) (1 diff)
• jenkins/macosx_pine-island_static (modified) (5 diffs)

issm/trunk/externalpackages/gmsh/install-static.sh ¶

@@ -27 +27 @@
 #Configure
 cd install
-cmake ../src -DCMAKE_INSTALL_PREFIX="$ISSM_DIR/externalpackages/gmsh/install" -DENABLE_MPI=0 -DENABLE_METIS=0
+cmake ../src -DCMAKE_INSTALL_PREFIX="$ISSM_DIR/externalpackages/gmsh/install" -DENABLE_BUILD_LIB=1 -DENABLE_METIS=0
 
 #Compile and install

issm/trunk/jenkins/macosx_pine-island_static ¶

@@ -5 +5 @@
 
 #MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
+MATLAB_PATH="/Applications/MATLAB_R2015b.app"
 
 #ISSM CONFIGURATION
 ISSM_CONFIG='--prefix=$ISSM_DIR \
-        --disable-static \
         --enable-standalone-executables \
         --enable-standalone-libraries \
         --with-matlab-dir=$MATLAB_PATH \
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich -lmpl -lpmpich" \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
+        --with-mpi-libflags="$ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a" \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -24 +23 @@
         --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
         --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin14/5.2.0/libgcc.a" \
+        --with-pic \
         --with-numthreads=4'
 
@@ -37 +37 @@
 EXTERNALPACKAGES="autotools    install.sh
                                                 cmake        install.sh
-                                                mpich        install-3.0-macosx64-static.sh
+                                                mpich        install-3.2-macosx64-static.sh
                                                 m1qn3        install.sh
-                                                petsc        install-3.6-macosx64-static.sh
+                                                petsc        install-3.7-macosx64-static.sh
                                                 triangle     install-macosx64.sh
                                                 math77        install.sh
@@ -55 +55 @@
 
 #number of cpus used in the nightly runs.
-NUMCPUS_RUN=2
+NUMCPUS_RUN=4
 
 #Nightly run options. The matlab routine runme.m will be called
@@ -62 +62 @@
 #ex: "'id',[101 102 103]"
 ##                           bamg mesh   FS
-#PYTHON_NROPTIONS="--exclude_name 'Dakota'"
-#MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,703,435,IdFromString('Dakota')]"
+#PYTHON_NROPTIONS=""
+#MATLAB_NROPTIONS=""