[MOAB-dev] r5625 - MOAB/trunk/tools

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-07-03 09:47:35 -0500 (Tue, 03 Jul 2012)
New Revision: 5625

Modified:
   MOAB/trunk/tools/Makefile.am
Log:
32-bit builds failed because:
 we can't build imesh and igeom because sizeof EntityHandle (4) is different
 from size of (void*) (8). We do this check when we configure.
 tools/Makefile.am added a direct dependency on iMesh, through pointsearch
 (Ryan)
as a workaround, we check now if imesh is enabled, before adding imesh to the
linking libraries (LDADD variable).

Still to be solved:
 -how to build imesh and igeom for 32 bit, on a 64 bit machine?
 -is pointsearch needing imesh?


Modified: MOAB/trunk/tools/Makefile.am
===================================================================
--- MOAB/trunk/tools/Makefile.am	2012-07-02 18:53:18 UTC (rev 5624)
+++ MOAB/trunk/tools/Makefile.am	2012-07-03 14:47:35 UTC (rev 5625)
@@ -5,7 +5,10 @@
 	       -I$(top_srcdir)/itaps \
                -I$(top_builddir)/src/parallel 
 
-LDADD = $(top_builddir)/src/libMOAB.la $(top_builddir)/itaps/imesh/libiMesh.la
+LDADD = $(top_builddir)/src/libMOAB.la
+if ENABLE_imesh
+ LDADD+= $(top_builddir)/itaps/imesh/libiMesh.la
+endif
 
 # For old (pre 1.10.x) versions of Automake
 docdir = @docdir@