From 86e465d5d8d0c256bb98b3e7435e5dbbe510984f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 19 Jul 2013 17:00:08 +0000 Subject: [PATCH] Updated OpenThreads version to be in sync with OSG version. --- include/OpenThreads/Version | 6 +++--- src/OpenThreads/CMakeLists.txt | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/OpenThreads/Version b/include/OpenThreads/Version index 39e5608ec..0e3b718a7 100644 --- a/include/OpenThreads/Version +++ b/include/OpenThreads/Version @@ -18,10 +18,10 @@ extern "C" { -#define OPENTHREADS_MAJOR_VERSION 2 -#define OPENTHREADS_MINOR_VERSION 6 +#define OPENTHREADS_MAJOR_VERSION 3 +#define OPENTHREADS_MINOR_VERSION 2 #define OPENTHREADS_PATCH_VERSION 0 -#define OPENTHREADS_SOVERSION 12 +#define OPENTHREADS_SOVERSION 13 /** OpenThreadsGetVersion() returns the library version number. * Numbering convention : OpenThreads-1.0 will return 1.0 from OpenThreadsGetVersion. */ diff --git a/src/OpenThreads/CMakeLists.txt b/src/OpenThreads/CMakeLists.txt index 168055ebe..7f6daf0f9 100644 --- a/src/OpenThreads/CMakeLists.txt +++ b/src/OpenThreads/CMakeLists.txt @@ -2,10 +2,10 @@ # what to do with it. ADD_DEFINITIONS(-DOPENTHREADS_EXPORTS) -SET(OPENTHREADS_MAJOR_VERSION 2) -SET(OPENTHREADS_MINOR_VERSION 6) +SET(OPENTHREADS_MAJOR_VERSION 3) +SET(OPENTHREADS_MINOR_VERSION 2) SET(OPENTHREADS_PATCH_VERSION 0) -SET(OPENTHREADS_SOVERSION 12) +SET(OPENTHREADS_SOVERSION 13) SET(OPENTHREADS_VERSION ${OPENTHREADS_MAJOR_VERSION}.${OPENTHREADS_MINOR_VERSION}.${OPENTHREADS_PATCH_VERSION}) @@ -55,10 +55,10 @@ SET(OpenThreads_PUBLIC_HEADERS ${HEADER_PATH}/Block ${HEADER_PATH}/Condition ${HEADER_PATH}/Exports - ${HEADER_PATH}/Mutex - ${HEADER_PATH}/ReadWriteMutex - ${HEADER_PATH}/ReentrantMutex - ${HEADER_PATH}/ScopedLock + ${HEADER_PATH}/Mutex + ${HEADER_PATH}/ReadWriteMutex + ${HEADER_PATH}/ReentrantMutex + ${HEADER_PATH}/ScopedLock ${HEADER_PATH}/Thread ${HEADER_PATH}/Version ${OPENTHREADS_CONFIG_HEADER} @@ -96,7 +96,7 @@ ELSEIF(WIN32) SUBDIRS(pthreads) ELSE() # Everybody else including Msys should probably go here - SUBDIRS(win32) + SUBDIRS(win32) # examples) ENDIF() ELSE()