Removed include/osg/Version and include/OpenThreads/Version headers as these are autogenerated.
Changed the paths for the OpenThreads/osg Version headers to be placed in the PROJECT_BINARY_DIR. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14557 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
parent
d7c6bb1c4b
commit
e5f5c30e4d
@ -573,7 +573,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/GL.in"
|
||||
################################################################################
|
||||
# Set Vertsion header file
|
||||
|
||||
SET(OPENSCENEGRAPH_VERSION_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/osg/Version")
|
||||
SET(OPENSCENEGRAPH_VERSION_HEADER "${PROJECT_BINARY_DIR}/include/osg/Version")
|
||||
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
|
||||
"${OPENSCENEGRAPH_VERSION_HEADER}")
|
||||
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
/* -*-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 <OpenThreads/Exports>
|
||||
|
||||
extern "C" {
|
||||
|
||||
#define OPENTHREADS_MAJOR_VERSION 3
|
||||
#define OPENTHREADS_MINOR_VERSION 3
|
||||
#define OPENTHREADS_PATCH_VERSION 0
|
||||
#define OPENTHREADS_SOVERSION 20
|
||||
|
||||
/** 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
|
||||
@ -1,73 +0,0 @@
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield
|
||||
*
|
||||
* 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 OSG_VERSION
|
||||
#define OSG_VERSION 1
|
||||
|
||||
#include <osg/Export>
|
||||
|
||||
extern "C" {
|
||||
|
||||
#define OPENSCENEGRAPH_MAJOR_VERSION 3
|
||||
#define OPENSCENEGRAPH_MINOR_VERSION 3
|
||||
#define OPENSCENEGRAPH_PATCH_VERSION 3
|
||||
#define OPENSCENEGRAPH_SOVERSION 115
|
||||
|
||||
/* Convenience macro that can be used to decide whether a feature is present or not i.e.
|
||||
* #if OSG_MIN_VERSION_REQUIRED(2,9,5)
|
||||
* your code here
|
||||
* #endif
|
||||
*/
|
||||
#define OSG_MIN_VERSION_REQUIRED(MAJOR, MINOR, PATCH) ((OPENSCENEGRAPH_MAJOR_VERSION>MAJOR) || (OPENSCENEGRAPH_MAJOR_VERSION==MAJOR && (OPENSCENEGRAPH_MINOR_VERSION>MINOR || (OPENSCENEGRAPH_MINOR_VERSION==MINOR && OPENSCENEGRAPH_PATCH_VERSION>=PATCH))))
|
||||
#define OSG_VERSION_LESS_THAN(MAJOR, MINOR, PATCH) ((OPENSCENEGRAPH_MAJOR_VERSION<MAJOR) || (OPENSCENEGRAPH_MAJOR_VERSION==MAJOR && (OPENSCENEGRAPH_MINOR_VERSION<MINOR || (OPENSCENEGRAPH_MINOR_VERSION==MINOR && OPENSCENEGRAPH_PATCH_VERSION<PATCH))))
|
||||
#define OSG_VERSION_LESS_OR_EQUAL(MAJOR, MINOR, PATCH) ((OPENSCENEGRAPH_MAJOR_VERSION<MAJOR) || (OPENSCENEGRAPH_MAJOR_VERSION==MAJOR && (OPENSCENEGRAPH_MINOR_VERSION<MINOR || (OPENSCENEGRAPH_MINOR_VERSION==MINOR && OPENSCENEGRAPH_PATCH_VERSION<=PATCH))))
|
||||
#define OSG_VERSION_GREATER_THAN(MAJOR, MINOR, PATCH) ((OPENSCENEGRAPH_MAJOR_VERSION>MAJOR) || (OPENSCENEGRAPH_MAJOR_VERSION==MAJOR && (OPENSCENEGRAPH_MINOR_VERSION>MINOR || (OPENSCENEGRAPH_MINOR_VERSION==MINOR && OPENSCENEGRAPH_PATCH_VERSION>PATCH))))
|
||||
#define OSG_VERSION_GREATER_OR_EQUAL(MAJOR, MINOR, PATCH) ((OPENSCENEGRAPH_MAJOR_VERSION>MAJOR) || (OPENSCENEGRAPH_MAJOR_VERSION==MAJOR && (OPENSCENEGRAPH_MINOR_VERSION>MINOR || (OPENSCENEGRAPH_MINOR_VERSION==MINOR && OPENSCENEGRAPH_PATCH_VERSION>=PATCH))))
|
||||
|
||||
|
||||
/**
|
||||
* osgGetVersion() returns the library version number.
|
||||
* Numbering convention : OpenSceneGraph-1.0 will return 1.0 from osgGetVersion.
|
||||
*
|
||||
* This C function can be also used to check for the existence of the OpenSceneGraph
|
||||
* library using autoconf and its m4 macro AC_CHECK_LIB.
|
||||
*
|
||||
* Here is the code to add to your configure.in:
|
||||
\verbatim
|
||||
#
|
||||
# Check for the OpenSceneGraph (OSG) library
|
||||
#
|
||||
AC_CHECK_LIB(osg, osgGetVersion, ,
|
||||
[AC_MSG_ERROR(OpenSceneGraph library not found. See http://www.openscenegraph.org)],)
|
||||
\endverbatim
|
||||
*/
|
||||
extern OSG_EXPORT const char* osgGetVersion();
|
||||
|
||||
/** The osgGetSOVersion() method returns the OpenSceneGraph shared object version number. */
|
||||
extern OSG_EXPORT const char* osgGetSOVersion();
|
||||
|
||||
/** The osgGetLibraryName() method returns the library name in human-friendly form. */
|
||||
extern OSG_EXPORT const char* osgGetLibraryName();
|
||||
|
||||
// old defines for backwards compatibility.
|
||||
#define OSG_VERSION_MAJOR OPENSCENEGRAPH_MAJOR_VERSION
|
||||
#define OSG_VERSION_MINOR OPENSCENEGRAPH_MINOR_VERSION
|
||||
#define OSG_VERSION_PATCH OPENSCENEGRAPH_PATCH_VERSION
|
||||
|
||||
#define OSG_VERSION_RELEASE OSG_VERSION_PATCH
|
||||
#define OSG_VERSION_REVISION 0
|
||||
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -29,7 +29,7 @@ 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")
|
||||
SET(OPENTHREADS_VERSION_HEADER "${PROJECT_BINARY_DIR}/include/OpenThreads/Version")
|
||||
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/common/Version.in"
|
||||
"${OPENTHREADS_VERSION_HEADER}")
|
||||
|
||||
@ -60,7 +60,7 @@ SET(OpenThreads_PUBLIC_HEADERS
|
||||
${HEADER_PATH}/ReentrantMutex
|
||||
${HEADER_PATH}/ScopedLock
|
||||
${HEADER_PATH}/Thread
|
||||
${HEADER_PATH}/Version
|
||||
${OPENTHREADS_VERSION_HEADER}
|
||||
${OPENTHREADS_CONFIG_HEADER}
|
||||
)
|
||||
|
||||
|
||||
@ -206,11 +206,11 @@ SET(TARGET_H
|
||||
${HEADER_PATH}/Vec4ub
|
||||
${HEADER_PATH}/Vec4ui
|
||||
${HEADER_PATH}/Vec4us
|
||||
${HEADER_PATH}/Version
|
||||
${HEADER_PATH}/VertexAttribDivisor
|
||||
${HEADER_PATH}/VertexProgram
|
||||
${HEADER_PATH}/View
|
||||
${HEADER_PATH}/Viewport
|
||||
${OPENSCENEGRAPH_VERSION_HEADER}
|
||||
${OPENSCENEGRAPH_CONFIG_HEADER}
|
||||
${OPENSCENEGRAPH_OPENGL_HEADER}
|
||||
)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user