[cig-commits] r13844 - cs/cigma/trunk

[luis at geodynamics.org]

Author: luis
Date: 2009-01-12 14:10:14 -0800 (Mon, 12 Jan 2009)
New Revision: 13844

Modified:
   cs/cigma/trunk/Makefile.am
Log:
Add NetCDF compiler flags to Makefile.am

We also add the header and source files for the cigma::ExodusReader class
and the underlying io_netcdf functions.

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2009-01-12 22:10:13 UTC (rev 13843)
+++ cs/cigma/trunk/Makefile.am	2009-01-12 22:10:14 UTC (rev 13844)
@@ -234,6 +234,7 @@
 libcigma_la_cppflags += -Wno-deprecated
 libcigma_la_cppflags += $(HDF5_INCLUDES)
 libcigma_la_cppflags += $(VTK_INCLUDES)
+libcigma_la_cppflags += $(NETCDF_INCLUDES)
 libcigma_la_cppflags += $(LOGGER_FLAGS)
 libcigma_la_cppflags += $(BOOST_CPPFLAGS)
 libcigma_la_cppflags += $(ANN_FLAGS)
@@ -241,6 +242,7 @@
 libcigma_la_ldflags =
 libcigma_la_ldflags += $(HDF5_LDFLAGS)
 libcigma_la_ldflags += $(VTK_LDFLAGS)
+libcigma_la_ldflags += $(NETCDF_LDFLAGS)
 
 libcigma_la_sources  += \
 	src/io_hdf5.h \
@@ -250,6 +252,12 @@
 	src/io_hdf5_writer.h \
 	src/io_hdf5_writer.cpp
 
+libcigma_la_sources += \
+	src/io_netcdf.h \
+	src/io_netcdf.cpp \
+	src/io_exo_reader.h \
+	src/io_exo_reader.cpp
+
 libcigma_la_sources  += \
 	src/io_vtk.h \
 	src/io_vtk.cpp \
@@ -292,11 +300,13 @@
 
 cigma_ldflags =
 cigma_ldflags += $(HDF5_LDFLAGS)
+cigma_ldflags += $(NETCDF_LDFLAGS)
 cigma_ldflags += $(VTK_LDFLAGS)
 cigma_ldflags += $(BOOST_LDFLAGS)
 
 cigma_ldadd =
 cigma_ldadd += $(HDF5_LIBS)
+cigma_ldadd += $(NETCDF_LIBS)
 cigma_ldadd += $(VTK_LIBS)
 cigma_ldadd += $(BOOST_SYSTEM_LIB)
 cigma_ldadd += $(BOOST_FILESYSTEM_LIB)