From 89fd422c98a66605bad3575daa62dace1a191dea Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 5 May 2015 11:05:09 +0000 Subject: [PATCH] Changed the CMP0020 check to > 2.8.10 Updated SO version number git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14864 16af8721-9629-0410-8352-f15c8da7e697 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3126ea204..d198c2d4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ if(COMMAND cmake_policy) # disable autolinking to qtmain as we have our own main() functions (new in Qt 5.1) if(${CMAKE_MAJOR_VERSION} GREATER 2 OR (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 8) OR - (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 8 AND ${CMAKE_PATCH_VERSION} GREATER 9)) + (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 8 AND ${CMAKE_PATCH_VERSION} GREATER 10)) cmake_policy(SET CMP0020 OLD) endif() # nicer version check - but needs at least CMake 2.6.2? Worth upgrading the requirements? @@ -54,7 +54,7 @@ PROJECT(OpenSceneGraph) SET(OPENSCENEGRAPH_MAJOR_VERSION 3) SET(OPENSCENEGRAPH_MINOR_VERSION 3) SET(OPENSCENEGRAPH_PATCH_VERSION 8) -SET(OPENSCENEGRAPH_SOVERSION 121) +SET(OPENSCENEGRAPH_SOVERSION 122) # set to 0 when not a release candidate, non zero means that any generated # svn tags will be treated as release candidates of given number