From d60b9714fe163f29caad8f2e6191804fbca7069e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 20 Nov 2017 12:49:20 +0000 Subject: [PATCH] Moved the version to 3.5.9 and the version setting code to top of CMake file --- CMakeLists.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 396a959f8..46cb0f32b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,15 @@ +# +# OpenSceneGraph CMake build file +# +SET(OPENSCENEGRAPH_MAJOR_VERSION 3) +SET(OPENSCENEGRAPH_MINOR_VERSION 5) +SET(OPENSCENEGRAPH_PATCH_VERSION 9) +SET(OPENSCENEGRAPH_SOVERSION 152) + + +# set to 0 when not a release candidate, non zero means that any generated +# git tags will be treated as release candidates of given number +SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE) set_property(GLOBAL PROPERTY USE_FOLDERS ON) @@ -113,15 +125,6 @@ ENDIF() PROJECT(OpenSceneGraph) -SET(OPENSCENEGRAPH_MAJOR_VERSION 3) -SET(OPENSCENEGRAPH_MINOR_VERSION 5) -SET(OPENSCENEGRAPH_PATCH_VERSION 8) -SET(OPENSCENEGRAPH_SOVERSION 152) - -# set to 0 when not a release candidate, non zero means that any generated -# git tags will be treated as release candidates of given number -SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0) - SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION})