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

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:13:25 -0800 (Tue, 09 Dec 2008)
New Revision: 13529

Modified:
   cs/cigma/trunk/Makefile.am
   cs/cigma/trunk/configure.ac
Log:
Update makefile and configure scripts

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-12-10 02:13:24 UTC (rev 13528)
+++ cs/cigma/trunk/Makefile.am	2008-12-10 02:13:25 UTC (rev 13529)
@@ -80,6 +80,7 @@
 libcigma_a_CPPFLAGS += -Wno-deprecated
 libcigma_a_CPPFLAGS += $(LOGGER_FLAGS)
 libcigma_a_CPPFLAGS += $(ANN_FLAGS)
+libcigma_a_CPPFLAGS += $(HDF5_INCLUDES)
 #libcigma_a_CPPFLAGS += $(HDF5_CXXFLAGS)
 #libcigma_a_CPPFLAGS += $(VTK_CXXFLAGS)
 
@@ -139,6 +140,10 @@
 	src/FunctionRegistry.cpp \
 	src/fn_zero.h \
 	src/fn_zero.cpp \
+	src/fn_one.h \
+	src/fn_one.cpp \
+	src/fn_test.h \
+	src/fn_test.cpp \
 	src/fn_explicit.h \
 	src/fn_explicit.cpp \
 	src/Field.h \
@@ -151,14 +156,22 @@
 	src/io_null_reader.cpp \
 	src/io_text_reader.h \
 	src/io_text_reader.cpp \
+	src/io_hdf5_reader.h \
+	src/io_hdf5_reader.cpp \
 	src/io_file_writer.h \
 	src/io_file_writer.cpp \
 	src/io_null_writer.h \
 	src/io_null_writer.cpp \
 	src/io_text_writer.h \
 	src/io_text_writer.cpp \
+	src/io_hdf5_writer.h \
+	src/io_hdf5_writer.cpp \
+	src/core_args.h \
+	src/core_args.cpp \
 	src/core_readers.h \
 	src/core_readers.cpp \
+	src/core_writers.h \
+	src/core_writers.cpp \
 	src/core_base_op.h \
 	src/core_base_op.cpp \
 	src/core_compare_op.h \
@@ -192,7 +205,7 @@
 cigma_LDADD =
 cigma_LDADD += libcigma.a
 cigma_LDADD += libann.a
-#cigma_LDADD += $(HDF5_LIBS) -lhdf5_cpp		# XXX: fix this flag
+cigma_LDADD += $(HDF5_LIBS) -lhdf5_cpp		# XXX: fix this flag (integrate cpp lib)
 #cigma_LDADD += $(VTK_LIBS)
 #cigma_LDADD += $(BOOST_FILESYSTEM_LIBS)
 #cigma_LDADD += $(BOOST_PROGRAM_OPTIONS_LIBS)
@@ -210,6 +223,12 @@
 	src/cli_base_cmd.cpp \
 	src/cli_list_cmd.h \
 	src/cli_list_cmd.cpp \
+	src/cli_extract_cmd.h \
+	src/cli_extract_cmd.cpp \
+	src/cli_eval_cmd.h \
+	src/cli_eval_cmd.cpp \
+	src/cli_compare_cmd.h \
+	src/cli_compare_cmd.cpp \
 	src/cigma.cpp
 
 #EXTRA_DIST +=
@@ -312,7 +331,9 @@
 check_PROGRAMS = cigma-test
 
 # Also run the tests as part of make check
-TESTS = cigma-test
+TESTS = \
+	cigma-test \
+	$(top_srcdir)/tests/system/runner.py
 #TESTS = \
 #	$(check_PROGRAMS) \
 #	$(top_srcdir)/tests/pytests/runner.py
@@ -326,6 +347,7 @@
 cigma_test_CXXFLAGS =
 cigma_test_CXXFLAGS += @CPPUNIT_CFLAGS@
 cigma_test_CXXFLAGS += $(ANN_FLAGS)
+cigma_test_CXXFLAGS += $(HDF5_INCLUDES)
 cigma_test_CXXFLAGS += -I$(top_srcdir)/src
 cigma_test_CXXFLAGS += -I$(top_srcdir)/tests
 
@@ -333,6 +355,7 @@
 cigma_test_LDADD += @CPPUNIT_LIBS@
 cigma_test_LDADD += libcigma.a
 cigma_test_LDADD += libann.a
+cigma_test_LDADD += $(HDF5_LIBS) -lhdf5_cpp
 cigma_test_LDADD += $(BOOST_FILESYSTEM_LIB)
 
 cigma_test_SOURCES = \

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2008-12-10 02:13:24 UTC (rev 13528)
+++ cs/cigma/trunk/configure.ac	2008-12-10 02:13:25 UTC (rev 13529)
@@ -36,6 +36,10 @@
     AM_CONDITIONAL(HAVE_PYTHON, false)
 fi
 
+dnl Configure HDF5 library
+CIGMA_OPTIONS_HDF5
+CIGMA_PATH_HDF5
+
 dnl Check for numpy
 AC_CHECK_PYTHON_MODULE(numpy)
 if [test "$PYTHON_numpy" != "1"]; then
@@ -95,6 +99,11 @@
 echo "- BOOST_PROGRAM_OPTIONS_LIB : $BOOST_PROGRAM_OPTIONS_LIB"
 echo "- BOOST_PYTHON_LIBS         : $BOOST_PYTHON_LIBS"
 
+# HDF5 flags
+echo "- HDF5_INCLUDES : $HDF5_INCLUDES"
+echo "- HDF5_LIBS     : $HDF5_LIBS"
+echo "- HDF5_LDFLAGS  : $HDF5_LDFLAGS"
+
 # CppUnit flags
 echo "- CPPUNIT_CFLAGS : $CPPUNIT_CFLAGS"
 echo "- CPPUNIT_LIBS   : $CPPUNIT_LIBS"