[cig-commits] r15373 - in short/3D/PyLith/trunk: . modulesrc/meshio

[brad at geodynamics.org]

Author: brad
Date: 2009-06-22 21:09:46 -0700 (Mon, 22 Jun 2009)
New Revision: 15373

Modified:
   short/3D/PyLith/trunk/configure.ac
   short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
   short/3D/PyLith/trunk/modulesrc/meshio/meshio.i
Log:
Fixed guard for inclusion/exclusion of CUBIT use for meshio module.

Modified: short/3D/PyLith/trunk/configure.ac
===================================================================
--- short/3D/PyLith/trunk/configure.ac	2009-06-23 03:39:19 UTC (rev 15372)
+++ short/3D/PyLith/trunk/configure.ac	2009-06-23 04:09:46 UTC (rev 15373)
@@ -41,16 +41,18 @@
     [AC_HELP_STRING([--enable-cubit],
         [enable reading/writing Cubit EXODUS files (requires netcdf) @<:@default=no@:>@])],
 	[enable_cubit=yes
-	CXXFLAGS="-DENABLE_CUBIT $CXXFLAGS"; export CXXFLAGS],
+	CPPFLAGS="-DENABLE_CUBIT $CPPFLAGS"; export CPPFLAGS;
+	PYLITH_SWIG_CPPFLAGS="-DENABLE_CUBIT $PYLITH_SWIG_CPPFLAGS"; export PYLITH_SWIG_CPPFLAGS],
 	[enable_cubit=no])
 AM_CONDITIONAL([ENABLE_CUBIT], [test "$enable_cubit" = yes])
+AC_SUBST(PYLITH_SWIG_CPPFLAGS)
 
 # PETSc w/TetGen
 AC_ARG_ENABLE([tetgen],
     [AC_HELP_STRING([--enable-tetgen],
         [enable generating simple meshes w/TetGen via PETSc @<:@default=no@:>@])],
 	[enable_tetgen=yes
-	CXXFLAGS="-DENABLE_TETGEN $CXXFLAGS"; export CXXFLAGS],
+	CPPFLAGS="-DENABLE_TETGEN $CPPFLAGS"; export CPPFLAGS],
 	[enable_tetgen=no])
 AM_CONDITIONAL([ENABLE_TETGEN], [test "$enable_tetgen" = yes])
 
@@ -59,7 +61,7 @@
     [AC_HELP_STRING([--enable-memory-logging],
         [enable memory logging @<:@default=no@:>@])],
 	[enable_memory_logging=yes
-	CXXFLAGS="-DALE_MEM_LOGGING $CXXFLAGS"; export CXXFLAGS],
+	CPPFLAGS="-DALE_MEM_LOGGING $CPPFLAGS"; export CPPFLAGS],
 	[enable_memory_logging=no])
 AM_CONDITIONAL([ENABLE_MEMORY_LOGGING], [test "$enable_memory_logging" = yes])
 

Modified: short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2009-06-23 03:39:19 UTC (rev 15372)
+++ short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2009-06-23 04:09:46 UTC (rev 15373)
@@ -56,7 +56,7 @@
 INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 
 $(srcdir)/meshio_wrap.cxx $(srcdir)/meshio.py: $(swig_sources)
-	$(SWIG) -Wall -c++ -python $<
+	$(SWIG) $(PYLITH_SWIG_CPPFLAGS) -Wall -c++ -python $<
 
 
 MAINTAINERCLEANFILES = \

Modified: short/3D/PyLith/trunk/modulesrc/meshio/meshio.i
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/meshio.i	2009-06-23 03:39:19 UTC (rev 15372)
+++ short/3D/PyLith/trunk/modulesrc/meshio/meshio.i	2009-06-23 04:09:46 UTC (rev 15373)
@@ -18,7 +18,9 @@
 #include "pylith/meshio/MeshIO.hh"
 #include "pylith/meshio/MeshIOAscii.hh"
 #include "pylith/meshio/MeshIOLagrit.hh"
+#ifdef ENABLE_CUBIT
 #include "pylith/meshio/MeshIOCubit.hh"
+#endif
 
 #include "pylith/meshio/VertexFilter.hh"
 #include "pylith/meshio/VertexFilterVecNorm.hh"
@@ -47,7 +49,9 @@
 %include "MeshIOObj.i"
 %include "MeshIOAscii.i"
 %include "MeshIOLagrit.i"
+#ifdef ENABLE_CUBIT
 %include "MeshIOCubit.i"
+#endif
 
 %include "VertexFilter.i"
 %include "VertexFilterVecNorm.i"