[cgma-dev] r6096 - in cgm/trunk: . geom geom/Cholla geom/facet util

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-11-21 13:11:52 -0600 (Thu, 21 Nov 2013)
New Revision: 6096

Modified:
   cgm/trunk/Makefile.am
   cgm/trunk/README.CGM
   cgm/trunk/geom/Cholla/Makefile.am
   cgm/trunk/geom/Curve.hpp
   cgm/trunk/geom/DagType.hpp
   cgm/trunk/geom/GeometryQueryEngine.hpp
   cgm/trunk/geom/GeometryQueryTool.cpp
   cgm/trunk/geom/GeometryQueryTool.hpp
   cgm/trunk/geom/Lump.hpp
   cgm/trunk/geom/ModelQueryEngine.hpp
   cgm/trunk/geom/RefEntityName.cpp
   cgm/trunk/geom/RefEntityName.hpp
   cgm/trunk/geom/Surface.hpp
   cgm/trunk/geom/facet/FacetAttrib.cpp
   cgm/trunk/geom/facet/FacetModifyEngine.cpp
   cgm/trunk/geom/facet/Makefile.am
   cgm/trunk/util/CubitMessage.hpp
   cgm/trunk/util/CubitVector.hpp
   cgm/trunk/util/DLIList.hpp
   cgm/trunk/util/Makefile.am
   cgm/trunk/util/SDLList.hpp
Log:
Fixed make distcheck problem for occshared, occstatic and cubitshared builds, all passed; Minor changes to remove some warnings; Added cgm_version.h file and removed this part of definition from GeomeryQueryTool.

Modified: cgm/trunk/Makefile.am
===================================================================
--- cgm/trunk/Makefile.am	2013-11-21 15:58:38 UTC (rev 6095)
+++ cgm/trunk/Makefile.am	2013-11-21 19:11:52 UTC (rev 6096)
@@ -11,6 +11,7 @@
 
 lib_LTLIBRARIES = libcgm.la
 
+libcgm_la_includedir = $(includedir)
 if ENABLE_igeom
   igeom_DIR = itaps
 else
@@ -40,7 +41,7 @@
                   $(CGM_ll_LIB) \
                   geom/virtual/libcubit_virtual.la \
                   geom/facet/libcubit_facet.la \
-		  geom/Cholla/libCholla.la \
+                  geom/Cholla/libCholla.la \
                   geom/facetbool/libcubit_facetbool.la \
                   geom/libcubit_geom.la \
                   util/libcubit_util.la 
@@ -55,6 +56,7 @@
 
 libcgm_la_SOURCES = 
 
+libcgm_la_include_HEADERS = cgm_version.h
 # By default, cmg.make will define these to $(srcdir).  We
 # want to override that during the INSTALL of the file so
 # that the correct values are set (e.g. if someone does 

Modified: cgm/trunk/README.CGM
===================================================================
--- cgm/trunk/README.CGM	2013-11-21 15:58:38 UTC (rev 6095)
+++ cgm/trunk/README.CGM	2013-11-21 19:11:52 UTC (rev 6096)
@@ -2,7 +2,7 @@
 The Common Geometry Module (CGM)
 Read Me
 
-This is code from merging the cubit13.1 code and Version12.2 code.
+This is code from merging the cubit14.0 code and Version13.1.1 code.
 =====================================
 
 The Common Geometry Module (CGM) is a code library which provides

Modified: cgm/trunk/geom/Cholla/Makefile.am
===================================================================
--- cgm/trunk/geom/Cholla/Makefile.am	2013-11-21 15:58:38 UTC (rev 6095)
+++ cgm/trunk/geom/Cholla/Makefile.am	2013-11-21 19:11:52 UTC (rev 6096)
@@ -25,6 +25,7 @@
     ChollaPoint.cpp \
     ChollaSkinTool.cpp \