[cgma-dev] r6081 - in cgm/branches/merge-cubit14.0: . geom geom/OCC geom/facet geom/facetbool geom/parallel geom/virtual itaps m4 test util

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-10-30 12:04:46 -0500 (Wed, 30 Oct 2013)
New Revision: 6081

Removed:
   cgm/branches/merge-cubit14.0/amendment/
Modified:
   cgm/branches/merge-cubit14.0/Makefile.am
   cgm/branches/merge-cubit14.0/cgm.make.in
   cgm/branches/merge-cubit14.0/configure.ac
   cgm/branches/merge-cubit14.0/geom/CAEntitySense.cpp
   cgm/branches/merge-cubit14.0/geom/CAEntitySense.hpp
   cgm/branches/merge-cubit14.0/geom/CAEntityTol.cpp
   cgm/branches/merge-cubit14.0/geom/CAEntityTol.hpp
   cgm/branches/merge-cubit14.0/geom/GfxPreview.hpp
   cgm/branches/merge-cubit14.0/geom/Makefile.am
   cgm/branches/merge-cubit14.0/geom/OCC/OCCLump.cpp
   cgm/branches/merge-cubit14.0/geom/OCC/OCCModifyEngine.cpp
   cgm/branches/merge-cubit14.0/geom/OCC/OCCQueryEngine.cpp
   cgm/branches/merge-cubit14.0/geom/facet/Makefile.am
   cgm/branches/merge-cubit14.0/geom/facetbool/Makefile.am
   cgm/branches/merge-cubit14.0/geom/parallel/Makefile.am
   cgm/branches/merge-cubit14.0/geom/virtual/Makefile.am
   cgm/branches/merge-cubit14.0/itaps/Makefile.am
   cgm/branches/merge-cubit14.0/itaps/iGeom_CGMA.cc
   cgm/branches/merge-cubit14.0/m4/libtool.m4
   cgm/branches/merge-cubit14.0/test/Makefile.am
   cgm/branches/merge-cubit14.0/test/modify.cpp
   cgm/branches/merge-cubit14.0/test/operation.cpp
   cgm/branches/merge-cubit14.0/test/r_w.cpp
   cgm/branches/merge-cubit14.0/util/CubitFileSimModel.cpp
   cgm/branches/merge-cubit14.0/util/Makefile.am
Log:
Updated for cgm merged with cubit14.0, migrated the recent changes from cgm trunk. Passed make check for static build with occ and cubit14.0.

Modified: cgm/branches/merge-cubit14.0/Makefile.am
===================================================================
--- cgm/branches/merge-cubit14.0/Makefile.am	2013-10-29 17:54:51 UTC (rev 6080)
+++ cgm/branches/merge-cubit14.0/Makefile.am	2013-10-30 17:04:46 UTC (rev 6081)
@@ -45,13 +45,13 @@
                   geom/libcubit_geom.la \
                   util/libcubit_util.la 
 else
-  CORE_CGM_LIBS = $(CGM_ll_LIB)
+  CORE_CGM_LIBS = geom/libcubit_geom.la $(CGM_ll_LIB)
 endif
 
-SUBDIRS =  amendment util geom init . $(igeom_DIR) test 
+SUBDIRS =  compat util geom init . $(igeom_DIR) test 
 # geom/testing
 
-libcgm_la_LIBADD = init/libcgma_init.la amendment/libcgma_amendment.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE)
+libcgm_la_LIBADD = init/libcgma_init.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE)
 
 libcgm_la_SOURCES = 
 

Modified: cgm/branches/merge-cubit14.0/cgm.make.in
===================================================================
--- cgm/branches/merge-cubit14.0/cgm.make.in	2013-10-29 17:54:51 UTC (rev 6080)
+++ cgm/branches/merge-cubit14.0/cgm.make.in	2013-10-30 17:04:46 UTC (rev 6081)
@@ -22,8 +22,6 @@
                   -I at abs_top_builddir@/init \
                   -I at abs_top_srcdir@/geom \
                   -I at abs_top_builddir@/geom \
-                  -I at abs_top_srcdir@/amendment \
-                  -I at abs_top_builddir@/amendment \
                   -I at abs_top_srcdir@/geom/ACIS \
                   -I at abs_top_srcdir@/geom/virtual \
                   -I at abs_top_srcdir@/geom/facet \

Modified: cgm/branches/merge-cubit14.0/configure.ac
===================================================================
--- cgm/branches/merge-cubit14.0/configure.ac	2013-10-29 17:54:51 UTC (rev 6080)
+++ cgm/branches/merge-cubit14.0/configure.ac	2013-10-30 17:04:46 UTC (rev 6081)
@@ -1,10 +1,12 @@
 ###############################################################################
 #                           Standard Stuff
 ################################################################################
-AC_INIT(CGMA, 13.1)
+AC_INIT(CGMA, 14.0)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([.])
 AC_CANONICAL_SYSTEM
+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])