[cgma-dev] r5855 - in cgm/trunk: . geom itaps test

[janehu at mcs.anl.gov]

Author: janehu
Date: 2012-11-06 13:38:17 -0600 (Tue, 06 Nov 2012)
New Revision: 5855

Modified:
   cgm/trunk/configure.ac
   cgm/trunk/geom/GeometryQueryTool.hpp
   cgm/trunk/itaps/Makefile.am
   cgm/trunk/test/Makefile.am
Log:
Double checked on occ-static and occ-shared, cubit-static and cubit-shared builds, all passed cgm make check except cubit-shared build has two files failed.

Modified: cgm/trunk/configure.ac
===================================================================
--- cgm/trunk/configure.ac	2012-11-06 16:44:43 UTC (rev 5854)
+++ cgm/trunk/configure.ac	2012-11-06 19:38:17 UTC (rev 5855)
@@ -187,8 +187,8 @@
 AC_SUBST(CUBIT_FILE)
 AC_SUBST(CUBIT_CGM)
 
-AM_CONDITIONAL(BUILD_CGM,[test x"$CUBIT_DIR" == x"no"])
-AM_CONDITIONAL(WITH_CUBIT,[test x"$CUBIT_DIR" != x"no"])
+AM_CONDITIONAL(BUILD_CGM,[test "x$CUBIT_DIR" == "xno"])
+AM_CONDITIONAL(WITH_CUBIT,[test "x$CUBIT_DIR" != "xno"])
 
 ################################################################################
 #                           ACIS OPTIONS

Modified: cgm/trunk/geom/GeometryQueryTool.hpp
===================================================================
--- cgm/trunk/geom/GeometryQueryTool.hpp	2012-11-06 16:44:43 UTC (rev 5854)
+++ cgm/trunk/geom/GeometryQueryTool.hpp	2012-11-06 19:38:17 UTC (rev 5855)
@@ -16,6 +16,8 @@
 #ifndef GEOMETRYQUERYTOOL_HPP
 #define GEOMETRYQUERYTOOL_HPP
 
+#define CUBIT_12 3
+
 #include <stdio.h>
 #include <typeinfo>
 #include <list>

Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2012-11-06 16:44:43 UTC (rev 5854)
+++ cgm/trunk/itaps/Makefile.am	2012-11-06 19:38:17 UTC (rev 5855)
@@ -71,9 +71,9 @@
 check_PROGRAMS = chaman $(TESTS)
 
 if BUILD_CGM
-  LDADD = libiGeom.la $(top_builddir)/geom/libcubit_geom.la $(top_builddir)/util/libcubit_util.la
+  LDADD = libiGeom.la $(top_builddir)/geom/libcubit_geom.la $(top_builddir)/util/libcubit_util.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS)
 else
-  LDADD = libiGeom.la
+  LDADD = libiGeom.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS)
 endif
 
 AM_LDFLAGS +=  $(CGM_EXT_LTFLAGS) $(CGM_EXT_LDFLAGS)

Modified: cgm/trunk/test/Makefile.am
===================================================================
--- cgm/trunk/test/Makefile.am	2012-11-06 16:44:43 UTC (rev 5854)
+++ cgm/trunk/test/Makefile.am	2012-11-06 19:38:17 UTC (rev 5855)