Changeset 13219

Timestamp:

Sep 2, 2012, 1:27:05 AM (14 years ago)

Author:

Eric.Larour

Message:

CHG: shielding krigging and kml modules from compile in adolc

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/modules/matlab/Makefile.am (modified) (5 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -1151 +1151 @@
 
         dnl Capabilities
+        dnl with-kml{{{
+        AC_ARG_WITH([kml],
+                AS_HELP_STRING([--with-kml = YES],[compile with kml capabilities (default is yes)]),
+                [KML=$withval],[KML=yes]) 
+        AC_MSG_CHECKING(for kml capability compilation)
+
+        if test "x$KML" = "xyes"; then
+                HAVE_KML=yes
+                AC_DEFINE([_HAVE_KML_],[1],[with kml capability])
+        else
+                HAVE_KML=no
+        fi
+        AM_CONDITIONAL([KML], [test x$HAVE_KML = xyes])
+        AC_MSG_RESULT($HAVE_KML)
+        dnl }}}
         dnl with-kriging{{{
         AC_ARG_WITH([kriging],

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

@@ -1 @@
-AM_CPPFLAGS = @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
+AM_CPPFLAGS = @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@ @ADOLCINCL@
 
 EXEEXT=$(MATLABWRAPPEREXT)
@@ -13 +13 @@
                                    ElementConnectivity.la\
                                    EnumToString.la\
-                                   Exp2Kml.la\
                                    HoleFiller.la\
                                    InternalFront.la\
@@ -21 +20 @@
                                    InterpFromMeshToGrid.la\
                                    InterpFromMesh2d.la\
-                                   KMLFileRead.la\
-                                   KMLMeshWrite.la\
-                                   KMLOverlay.la\
-                                   Kml2Exp.la\
-                                   Kriging.la\
                                    Ll2xy.la\
                                    NodeConnectivity.la\
@@ -32 +26 @@
                                    PointCloudFindNeighbors.la\
                                    PropagateFlagsFromConnectivity.la\
-                                   Shp2Kml.la\
                                    StringToEnum.la\
                                    TriaSearch.la\
@@ -40 +33 @@
                                    Xy2ll.la\
                    Chaco.la
+
+if KRIGING
+lib_LTLIBRARIES +=  Kriging.la
+endif
+if KML
+lib_LTLIBRARIES +=  KMLFileRead.la\
+                                   KMLMeshWrite.la\
+                                   KMLOverlay.la\
+                                   Shp2Kml.la\
+                                   Exp2Kml.la\
+                                   Kml2Exp.la
+endif
 endif 
+
 #}}}
 #Flags and libraries {{{1