Author: janehu Date: 2013-11-22 13:46:32 -0600 (Fri, 22 Nov 2013) New Revision: 6103 Added: cgm/tags/13.1.0/cgm_version.h Modified: cgm/tags/13.1.0/Makefile.am cgm/tags/13.1.0/geom/GeometryQueryTool.cpp cgm/tags/13.1.0/geom/GeometryQueryTool.hpp Log: Moved cgm version to a separate header file. Modified: cgm/tags/13.1.0/Makefile.am =================================================================== --- cgm/tags/13.1.0/Makefile.am 2013-11-22 17:56:35 UTC (rev 6102) +++ cgm/tags/13.1.0/Makefile.am 2013-11-22 19:46:32 UTC (rev 6103) @@ -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/tags/13.1.0/cgm_version.h =================================================================== --- cgm/tags/13.1.0/cgm_version.h (rev 0) +++ cgm/tags/13.1.0/cgm_version.h 2013-11-22 19:46:32 UTC (rev 6103) @@ -0,0 +1,2 @@ +#define CGM_MAJOR_VERSION 13 +#define CGM_MINOR_VERSION 1 Modified: cgm/tags/13.1.0/geom/GeometryQueryTool.cpp =================================================================== --- cgm/tags/13.1.0/geom/GeometryQueryTool.cpp 2013-11-22 17:56:35 UTC (rev 6102) +++ cgm/tags/13.1.0/geom/GeometryQueryTool.cpp 2013-11-22 19:46:32 UTC (rev 6103) @@ -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.0/geom/GeometryQueryTool.hpp =================================================================== --- cgm/tags/13.1.0/geom/GeometryQueryTool.hpp 2013-11-22 17:56:35 UTC (rev 6102) +++ cgm/tags/13.1.0/geom/GeometryQueryTool.hpp 2013-11-22 19:46:32 UTC (rev 6103) @@ -1114,9 +1114,6 @@ int maxPersistentRefEdgeId; int maxPersistentRefVertexId;