[cgma-dev] r3448 - in cgm/branches/merge-cubit12: . geom

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-01-20 10:02:44 -0600 (Wed, 20 Jan 2010)
New Revision: 3448

Modified:
   cgm/branches/merge-cubit12/configure.ac
   cgm/branches/merge-cubit12/geom/Makefile.am
Log:
include new tests in build

Modified: cgm/branches/merge-cubit12/configure.ac
===================================================================
--- cgm/branches/merge-cubit12/configure.ac	2010-01-20 15:59:04 UTC (rev 3447)
+++ cgm/branches/merge-cubit12/configure.ac	2010-01-20 16:02:44 UTC (rev 3448)
@@ -444,6 +444,7 @@
            geom/facetbool/Makefile
            geom/OCC/Makefile
            geom/parallel/Makefile
+           geom/testing/Makefile
            geom/virtual/Makefile 
            init/Makefile
            compat/Makefile

Modified: cgm/branches/merge-cubit12/geom/Makefile.am
===================================================================
--- cgm/branches/merge-cubit12/geom/Makefile.am	2010-01-20 15:59:04 UTC (rev 3447)
+++ cgm/branches/merge-cubit12/geom/Makefile.am	2010-01-20 16:02:44 UTC (rev 3448)
@@ -11,10 +11,10 @@
 if build_parallel
   SUBDIRS += parallel
 endif
-SUBDIRS += testing
 if build_OCC
   SUBDIRS += OCC
 endif
+SUBDIRS += testing
 
 # Override default defines with the ones we want from the configure script
 DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN)