diff --git a/include/OpenThreads/Version b/include/OpenThreads/Version index 0b25d5741..80e6f718f 100644 --- a/include/OpenThreads/Version +++ b/include/OpenThreads/Version @@ -1,13 +1,13 @@ /* -*-c++-*- OpenThreads library, Copyright (C) 2002 - 2007 The Open Thread Group * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -19,9 +19,9 @@ extern "C" { #define OPENTHREADS_MAJOR_VERSION 2 -#define OPENTHREADS_MINOR_VERSION 4 +#define OPENTHREADS_MINOR_VERSION 5 #define OPENTHREADS_PATCH_VERSION 0 -#define OPENTHREADS_SOVERSION 11 +#define OPENTHREADS_SOVERSION 12 /** 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 222a37340..91f4ea426 100644 --- a/src/OpenThreads/CMakeLists.txt +++ b/src/OpenThreads/CMakeLists.txt @@ -27,6 +27,10 @@ SET(OPENTHREADS_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/OpenThreads/Config" CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/common/Config.in" "${OPENTHREADS_CONFIG_HEADER}") +SET(OPENTHREADS_VERSION_HEADER "${PROJECT_SOURCE_DIR}/include/OpenThreads/Version") +CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/common/Version.in" + "${OPENTHREADS_VERSION_HEADER}") + ################################################################################ # Set Version Info resource file diff --git a/src/OpenThreads/common/Version.in b/src/OpenThreads/common/Version.in new file mode 100644 index 000000000..4d78034c8 --- /dev/null +++ b/src/OpenThreads/common/Version.in @@ -0,0 +1,38 @@ +/* -*-c++-*- OpenThreads library, Copyright (C) 2002 - 2007 The Open Thread Group + * + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * OpenSceneGraph Public License for more details. +*/ + +#ifndef OPENTHREADS_VERSION +#define OPENTHREADS_VERSION 1 + +#include + +extern "C" { + +#define OPENTHREADS_MAJOR_VERSION @OPENTHREADS_MAJOR_VERSION@ +#define OPENTHREADS_MINOR_VERSION @OPENTHREADS_MINOR_VERSION@ +#define OPENTHREADS_PATCH_VERSION @OPENTHREADS_PATCH_VERSION@ +#define OPENTHREADS_SOVERSION @OPENTHREADS_SOVERSION@ + +/** OpenThreadsGetVersion() returns the library version number. + * Numbering convention : OpenThreads-1.0 will return 1.0 from OpenThreadsGetVersion. */ +extern OPENTHREAD_EXPORT_DIRECTIVE const char* OpenThreadsGetVersion(); + +/** The OpenThreadsGetSOVersion() method returns the OpenSceneGraph soversion number. */ +extern OPENTHREAD_EXPORT_DIRECTIVE const char* OpenThreadsGetSOVersion(); + +/** The OpenThreadsGetLibraryName() method returns the library name in human-friendly form. */ +extern OPENTHREAD_EXPORT_DIRECTIVE const char* OpenThreadsGetLibraryName(); + +} + +#endif