Changeset 19436

Timestamp:

07/13/15 16:55:00 (10 years ago)

Author:

glperez

Message:

CHG: Static Mac OSX build should now work with M1QN3.

Location:

issm/trunk-jpl

Files:

• packagers/macosx/install.sh (modified) (1 diff)
• src/c/Makefile.am (modified) (1 diff)
• src/wrappers/matlab/Makefile.am (modified) (1 diff)

issm/trunk-jpl/packagers/macosx/install.sh

@@ -113 +113 @@
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
+        --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \

issm/trunk-jpl/src/c/Makefile.am

@@ -566 +566 @@
 
 if !WINDOWS
+if !STANDALONE_LIBRARIES
 libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(M1QN3LIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB)   $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB)
+endif
 endif
 

issm/trunk-jpl/src/wrappers/matlab/Makefile.am

@@ -128 +128 @@
 if STANDALONE_LIBRARIES
 libISSMMatlab_la_LDFLAGS = -static 
+deps += $(PETSCLIB) $(TAOLIB) $(M1QN3LIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB)   $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB)
 endif