[cgma-dev] r6100 - in cgm/tags/13.1.1: . geom

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-11-22 11:55:45 -0600 (Fri, 22 Nov 2013)
New Revision: 6100

Modified:
   cgm/tags/13.1.1/Makefile.am
   cgm/tags/13.1.1/geom/GeometryQueryTool.cpp
   cgm/tags/13.1.1/geom/GeometryQueryTool.hpp
Log:
Changed the cgm version info into a separate header file, removed it from GeometryQueryTool. Passed occshared and cubitshared distcheck.

Modified: cgm/tags/13.1.1/Makefile.am
===================================================================
--- cgm/tags/13.1.1/Makefile.am	2013-11-22 17:01:57 UTC (rev 6099)
+++ cgm/tags/13.1.1/Makefile.am	2013-11-22 17:55:45 UTC (rev 6100)
@@ -11,6 +11,7 @@
 
 lib_LTLIBRARIES = libcgm.la
 
+libcgm_la_includedir = $(includedir)
 if ENABLE_igeom
   igeom_DIR = itaps
 else
@@ -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/tags/13.1.1/geom/GeometryQueryTool.cpp
===================================================================
--- cgm/tags/13.1.1/geom/GeometryQueryTool.cpp	2013-11-22 17:01:57 UTC (rev 6099)
+++ cgm/tags/13.1.1/geom/GeometryQueryTool.cpp	2013-11-22 17:55:45 UTC (rev 6100)
@@ -92,9 +92,6 @@
 DLIList<int> GeometryQueryTool::uidsOfImportingEnts;
 int GeometryQueryTool::entitiesMergedAway = 0;
 
-const int GeometryQueryTool::CGM_MAJOR_VERSION = 13;
-const int GeometryQueryTool::CGM_MINOR_VERSION = 1;
-
 #ifndef CAT
   // Keep checking bounding box and use internal surf check for Sandia
   CubitBoolean GeometryQueryTool::bboxMergeTest = CUBIT_TRUE;

Modified: cgm/tags/13.1.1/geom/GeometryQueryTool.hpp
===================================================================
--- cgm/tags/13.1.1/geom/GeometryQueryTool.hpp	2013-11-22 17:01:57 UTC (rev 6099)
+++ cgm/tags/13.1.1/geom/GeometryQueryTool.hpp	2013-11-22 17:55:45 UTC (rev 6100)
@@ -1114,9 +1114,6 @@
   int maxPersistentRefEdgeId;
   int maxPersistentRefVertexId;
 
-  static const int CGM_MAJOR_VERSION;
-  static const int CGM_MINOR_VERSION;
-
   CGMHistory mHistory;
 };