Author: jvporter Date: 2011-11-29 17:27:19 -0600 (Tue, 29 Nov 2011) New Revision: 5232 Added: MOAB/trunk/itaps/igeom/FBiGeom-Defs.inc.in MOAB/trunk/itaps/igeom/FBiGeom.h MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp MOAB/trunk/itaps/igeom/FBiGeom_MOAB.hpp MOAB/trunk/itaps/igeom/FBiGeom_f.h Removed: MOAB/trunk/itaps/igeom/iGeom-Defs.inc.in MOAB/trunk/itaps/igeom/iGeom.h MOAB/trunk/itaps/igeom/iGeom_MOAB.cpp MOAB/trunk/itaps/igeom/iGeom_MOAB.hpp MOAB/trunk/itaps/igeom/iGeom_f.h Modified: MOAB/trunk/configure.ac MOAB/trunk/itaps/igeom/Makefile.am MOAB/trunk/itaps/igeom/testSmooth.cc MOAB/trunk/itaps/igeom/testgeom.cc Log: Rename iGeom interface to FBiGeom to prevent collisions with CGM's iGeom Modified: MOAB/trunk/configure.ac =================================================================== --- MOAB/trunk/configure.ac 2011-11-29 22:35:07 UTC (rev 5231) +++ MOAB/trunk/configure.ac 2011-11-29 23:27:19 UTC (rev 5232) @@ -1148,7 +1148,7 @@ itaps/imesh/Makefile itaps/imesh/iMesh-Defs.inc itaps/igeom/Makefile - itaps/igeom/iGeom-Defs.inc + itaps/igeom/FBiGeom-Defs.inc tools/Makefile tools/refiner/Makefile tools/mbcoupler/Makefile Copied: MOAB/trunk/itaps/igeom/FBiGeom-Defs.inc.in (from rev 5229, MOAB/trunk/itaps/igeom/iGeom-Defs.inc.in) =================================================================== --- MOAB/trunk/itaps/igeom/FBiGeom-Defs.inc.in (rev 0) +++ MOAB/trunk/itaps/igeom/FBiGeom-Defs.inc.in 2011-11-29 23:27:19 UTC (rev 5232) @@ -0,0 +1,23 @@ +FBIGEOM_CXXFLAGS = @CXXFLAGS@ +FBIGEOM_CFLAGS = @CFLAGS@ +FBIGEOM_LDFLAGS = @EXPORT_LDFLAGS@ + +FBIGEOM_FC = @FC@ +FBIGEOM_FCFLAGS = @FCFLAGS@ + +FBIGEOM_FCDEFS = @DEFS@ + +FBIGEOM_CPPFLAGS = -I$(FBIGEOM_INCLUDEDIR) $(FBIGEOM_INCLUDEDIR2) + +# This definition is deprecated; use IMESH_CPPFLAGS instead +FBIGEOM_INCLUDES = $(FBIGEOM_CPPFLAGS) + +FBIGEOM_LIBS = $(FBIGEOM_LDFLAGS) -L$(MOAB_LIBDIR) \ + -L$(FBIGEOM_LIBDIR) -liMesh -lMOAB \ + @NETCDF_LIBS@ @HDF5_LIBS@ @LIBS@ \ + @CGM_LDFLAGS@ @CGM_LIBS@ + +FBIGEOM_INCLUDEDIR1 = @abs_srcdir@ +FBIGEOM_INCLUDEDIR2 = -I@abs_top_builddir@ +FBIGEOM_LIBDIR = @abs_builddir@/.libs +MOAB_LIBDIR = @abs_builddir@/../../.libs Copied: MOAB/trunk/itaps/igeom/FBiGeom.h (from rev 5229, MOAB/trunk/itaps/igeom/iGeom.h) =================================================================== --- MOAB/trunk/itaps/igeom/FBiGeom.h (rev 0) +++ MOAB/trunk/itaps/igeom/FBiGeom.h 2011-11-29 23:27:19 UTC (rev 5232) @@ -0,0 +1,3978 @@ +#ifndef _ITAPS_FBiGeom +#define _ITAPS_FBiGeom +