Changeset 19579

Timestamp:

09/24/15 18:11:06 (9 years ago)

Author:

glperez

Message:

CHG: Removed cccl from configure.ac
CHG: Added TRIANGLELIB for standalone libraries. Needed for Windows build.

Location:

issm/trunk-jpl

Files:

• configure.ac (modified) (1 diff)
• src/wrappers/matlab/Makefile.am (modified) (1 diff)

issm/trunk-jpl/configure.ac ¶

@@ -11 +11 @@
 
 #Compilers
-AC_PROG_CC([icc cccl cl icl gcc])
+AC_PROG_CC([icc cl icl gcc])
 AC_PROG_CPP
-AC_PROG_CXX([icpc cccl cl icl g++])
+AC_PROG_CXX([icpc cl icl g++])
 AC_PROG_F77([ifort g77 gfortran])
 

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)
+deps += $(PETSCLIB) $(TAOLIB) $(M1QN3LIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(TRIANGLELIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB)   $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB)
 endif