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

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-11-25 12:38:55 -0600 (Mon, 25 Nov 2013)
New Revision: 6104

Added:
   cgm/branches/merge-cubit12.2/cgm_version.h
Modified:
   cgm/branches/merge-cubit12.2/Makefile.am
   cgm/branches/merge-cubit12.2/geom/GeometryQueryTool.cpp
   cgm/branches/merge-cubit12.2/geom/GeometryQueryTool.hpp
Log:
Changed the cgm version to a separate file instead of in GeometryQueryTool.

Modified: cgm/branches/merge-cubit12.2/Makefile.am
===================================================================
--- cgm/branches/merge-cubit12.2/Makefile.am	2013-11-22 19:46:32 UTC (rev 6103)
+++ cgm/branches/merge-cubit12.2/Makefile.am	2013-11-25 18:38:55 UTC (rev 6104)
@@ -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 

Added: cgm/branches/merge-cubit12.2/cgm_version.h
===================================================================
--- cgm/branches/merge-cubit12.2/cgm_version.h	                        (rev 0)
+++ cgm/branches/merge-cubit12.2/cgm_version.h	2013-11-25 18:38:55 UTC (rev 6104)
@@ -0,0 +1,2 @@
+#define  CGM_MAJOR_VERSION  12
+#define  CGM_MINOR_VERSION  2

Modified: cgm/branches/merge-cubit12.2/geom/GeometryQueryTool.cpp
===================================================================
--- cgm/branches/merge-cubit12.2/geom/GeometryQueryTool.cpp	2013-11-22 19:46:32 UTC (rev 6103)
+++ cgm/branches/merge-cubit12.2/geom/GeometryQueryTool.cpp	2013-11-25 18:38:55 UTC (rev 6104)
@@ -88,9 +88,6 @@
 DLIList<int> GeometryQueryTool::uidsOfImportingEnts;
 int GeometryQueryTool::entitiesMergedAway = 0;
 
-const int GeometryQueryTool::CGM_MAJOR_VERSION = 10;
-const int GeometryQueryTool::CGM_MINOR_VERSION = 2;
-
 #ifndef CAT
   // Keep checking bounding box and use internal surf check for Sandia
   CubitBoolean GeometryQueryTool::bboxMergeTest = CUBIT_TRUE;

Modified: cgm/branches/merge-cubit12.2/geom/GeometryQueryTool.hpp
===================================================================
--- cgm/branches/merge-cubit12.2/geom/GeometryQueryTool.hpp	2013-11-22 19:46:32 UTC (rev 6103)
+++ cgm/branches/merge-cubit12.2/geom/GeometryQueryTool.hpp	2013-11-25 18:38:55 UTC (rev 6104)
@@ -1056,9 +1056,6 @@
   int maxPersistentRefEdgeId;
   int maxPersistentRefVertexId;