From 2b3ac015bbb33c3dec0176ea8ba03ec656ee19b5 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 24 Apr 2018 17:05:03 +0100
Subject: [PATCH] Renamed CMake variable + C++ #define to
 OSG_GL_CONTEXT_VERSION

---
 CMakeLists.txt              | 4 ++--
 src/osg/DisplaySettings.cpp | 2 +-
 src/osg/GL.in               | 2 +-
 src/osg/GraphicsContext.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91718422c..e157b6d83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -556,12 +556,12 @@ ELSE()
     OPTION(OSG_CPP_EXCEPTIONS_AVAILABLE "Set to OFF to disable compile of OSG components that use C++ exceptions." ON)
 ENDIF()
 
-SET(OSG_GL_CONTEXT_STRING "1.0" CACHE STRING "GL Context String to pass when creaing graphics contexts")
+SET(OSG_GL_CONTEXT_VERSION "1.0" CACHE STRING "GL Context String to pass when creaing graphics contexts")
 
 # Map the OSG_GL*_AVAILABLE settings to OpenGL header settings
 IF (OSG_GL3_AVAILABLE)
 
-    SET(OSG_GL_CONTEXT_STRING "3.3")
+    SET(OSG_GL_CONTEXT_VERSION "3.3")
 
     IF (APPLE)
         SET(OPENGL_HEADER1 "#include <OpenGL/gl.h>" CACHE STRING "#include<> line for OpenGL Header")
diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp
index 7aa9964c1..5c699c8b0 100644
--- a/src/osg/DisplaySettings.cpp
+++ b/src/osg/DisplaySettings.cpp
@@ -240,7 +240,7 @@ void DisplaySettings::setDefaults()
 
     _implicitBufferAttachmentRenderMask = DEFAULT_IMPLICIT_BUFFER_ATTACHMENT;
     _implicitBufferAttachmentResolveMask = DEFAULT_IMPLICIT_BUFFER_ATTACHMENT;
-    _glContextVersion = OSG_GL_CONTEXT_STRING;
+    _glContextVersion = OSG_GL_CONTEXT_VERSION;
     _glContextFlags = 0;
     _glContextProfileMask = 0;
 
diff --git a/src/osg/GL.in b/src/osg/GL.in
index ac4a97fe6..2f790be4f 100644
--- a/src/osg/GL.in
+++ b/src/osg/GL.in
@@ -39,7 +39,7 @@
 #define OSG_GLES1_FEATURES @OSG_GLES1_FEATURES@
 #define OSG_GLES2_FEATURES @OSG_GLES2_FEATURES@
 #define OSG_GLES3_FEATURES @OSG_GLES3_FEATURES@
-#define OSG_GL_CONTEXT_STRING "@OSG_GL_CONTEXT_STRING@"
+#define OSG_GL_CONTEXT_VERSION "@OSG_GL_CONTEXT_VERSION@"
 
 
 #ifndef WIN32
diff --git a/src/osg/GraphicsContext.cpp b/src/osg/GraphicsContext.cpp
index 409790f29..9d172ec88 100644
--- a/src/osg/GraphicsContext.cpp
+++ b/src/osg/GraphicsContext.cpp
@@ -239,7 +239,7 @@ GraphicsContext::Traits::Traits(DisplaySettings* ds):
             swapBarrier(0),
             useMultiThreadedOpenGLEngine(false),
             useCursor(true),
-            glContextVersion(OSG_GL_CONTEXT_STRING),
+            glContextVersion(OSG_GL_CONTEXT_VERSION),
             glContextFlags(0),
             glContextProfileMask(0),
             sharedContext(0),