diff --git a/CMakeLists.txt b/CMakeLists.txt index 3809fef89..51e68ab1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,8 @@ PROJECT(OpenSceneGraph) SET(OPENSCENEGRAPH_MAJOR_VERSION 2) SET(OPENSCENEGRAPH_MINOR_VERSION 5) -SET(OPENSCENEGRAPH_PATCH_VERSION 2) -SET(OPENSCENEGRAPH_SOVERSION 38) +SET(OPENSCENEGRAPH_PATCH_VERSION 3) +SET(OPENSCENEGRAPH_SOVERSION 39) SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) diff --git a/include/OpenThreads/Version b/include/OpenThreads/Version index 8e960b323..63bae974e 100644 --- a/include/OpenThreads/Version +++ b/include/OpenThreads/Version @@ -19,9 +19,9 @@ extern "C" { #define OPENTHREADS_MAJOR_VERSION 2 -#define OPENTHREADS_MINOR_VERSION 2 -#define OPENTHREADS_PATCH_VERSION 1 -#define OPENTHREADS_SOVERSION 10 +#define OPENTHREADS_MINOR_VERSION 3 +#define OPENTHREADS_PATCH_VERSION 0 +#define OPENTHREADS_SOVERSION 11 /** OpenThreadsGetVersion() returns the library version number. * Numbering convention : OpenThreads-1.0 will return 1.0 from OpenThreadsGetVersion. */ diff --git a/include/osg/Version b/include/osg/Version index af0f82867..c90ec105e 100644 --- a/include/osg/Version +++ b/include/osg/Version @@ -21,8 +21,8 @@ extern "C" { #define OPENSCENEGRAPH_MAJOR_VERSION 2 #define OPENSCENEGRAPH_MINOR_VERSION 5 -#define OPENSCENEGRAPH_PATCH_VERSION 2 -#define OPENSCENEGRAPH_SOVERSION 38 +#define OPENSCENEGRAPH_PATCH_VERSION 3 +#define OPENSCENEGRAPH_SOVERSION 39 /** * osgGetVersion() returns the library version number. diff --git a/packaging/pkgconfig/openscenegraph.pc b/packaging/pkgconfig/openscenegraph.pc index 65504e444..049d2b102 100644 --- a/packaging/pkgconfig/openscenegraph.pc +++ b/packaging/pkgconfig/openscenegraph.pc @@ -7,7 +7,7 @@ includedir=${prefix}/include Name: openscenegraph Description: 3D scenegraph -Version: 2.5.2 +Version: 2.5.3 Requires: openthreads Conflicts: Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil -losgTerrain -losgManipulator -losgViewer diff --git a/packaging/pkgconfig/openthreads.pc b/packaging/pkgconfig/openthreads.pc index 77733af21..cdf0309b5 100644 --- a/packaging/pkgconfig/openthreads.pc +++ b/packaging/pkgconfig/openthreads.pc @@ -7,7 +7,7 @@ includedir=${prefix}/include Name: openthreads Description: Object-Oriented (OO) thread interface for C++ programmers -Version: 2.2.1 +Version: 2.3.0 Requires: Conflicts: Libs: -L${libdir} -lOpenThreads diff --git a/src/OpenThreads/CMakeLists.txt b/src/OpenThreads/CMakeLists.txt index f186acee9..b59db52b1 100644 --- a/src/OpenThreads/CMakeLists.txt +++ b/src/OpenThreads/CMakeLists.txt @@ -3,9 +3,9 @@ ADD_DEFINITIONS(-DOPENTHREADS_EXPORTS) SET(OPENTHREADS_MAJOR_VERSION 2) -SET(OPENTHREADS_MINOR_VERSION 2) -SET(OPENTHREADS_PATCH_VERSION 1) -SET(OPENTHREADS_SOVERSION 10) +SET(OPENTHREADS_MINOR_VERSION 3) +SET(OPENTHREADS_PATCH_VERSION 0) +SET(OPENTHREADS_SOVERSION 11) SET(OPENTHREADS_VERSION ${OPENTHREADS_MAJOR_VERSION}.${OPENTHREADS_MINOR_VERSION}.${OPENTHREADS_PATCH_VERSION})