FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the include/osg/Config and include/OpenThreads/Config references to use the assocaited CMake variable for these headers

Browse Source
This commit is contained in:
Robert Osfield 2008-06-20 19:52:14 +00:00
parent e56ff4d5c6
commit 415d45525c
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -194,6 +194,16 @@ MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGSPHERE)
OPTION(OSG_USE_FLOAT_BOUNDINGBOX "Set to ON to build OpenSceneGraph with float BoundingBox instead of double." ON) OPTION(OSG_USE_FLOAT_BOUNDINGBOX "Set to ON to build OpenSceneGraph with float BoundingBox instead of double." ON)
MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGBOX) MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGBOX)
################################################################################
# Set Config file
SET(OPENSCENEGRAPH_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/osg/Config")
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Config.in"
"${OPENSCENEGRAPH_CONFIG_HEADER}")
INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
################################################################################ ################################################################################
# 3rd Party Dependency Stuff # 3rd Party Dependency Stuff
IF(WIN32) IF(WIN32)
@ -584,11 +594,6 @@ IF(BUILD_DOCUMENTATION)
) )
ENDIF(BUILD_DOCUMENTATION) ENDIF(BUILD_DOCUMENTATION)
SET(OPENSCENEGRAPH_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/osg/Config")
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Config.in"
"${OPENSCENEGRAPH_CONFIG_HEADER}")
INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
# This needs to be run very last so other parts of the scripts can take # This needs to be run very last so other parts of the scripts can take
# advantage of this. # advantage of this.
IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE) IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)

20
src/OpenThreads/CMakeLists.txt
View File

@ -9,6 +9,18 @@ SET(OPENTHREADS_SOVERSION 11)
SET(OPENTHREADS_VERSION ${OPENTHREADS_MAJOR_VERSION}.${OPENTHREADS_MINOR_VERSION}.${OPENTHREADS_PATCH_VERSION}) SET(OPENTHREADS_VERSION ${OPENTHREADS_MAJOR_VERSION}.${OPENTHREADS_MINOR_VERSION}.${OPENTHREADS_PATCH_VERSION})
INCLUDE(CheckAtomicOps)
################################################################################
# Set Config file
SET(OPENTHREADS_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/OpenThreads/Config")
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/common/Config.in"
"${OPENTHREADS_CONFIG_HEADER}")
INSTALL_FILES(/include/OpenThreads/ FILES "${OPENTHREADS_CONFIG_HEADER}")
################################################################################
SET(HEADER_PATH ${OpenThreads_SOURCE_DIR}/include/OpenThreads) SET(HEADER_PATH ${OpenThreads_SOURCE_DIR}/include/OpenThreads)
SET(OpenThreads_PUBLIC_HEADERS SET(OpenThreads_PUBLIC_HEADERS
${HEADER_PATH}/Atomic ${HEADER_PATH}/Atomic
@ -22,6 +34,7 @@ SET(OpenThreads_PUBLIC_HEADERS
${HEADER_PATH}/ScopedLock ${HEADER_PATH}/ScopedLock
${HEADER_PATH}/Thread ${HEADER_PATH}/Thread
${HEADER_PATH}/Version ${HEADER_PATH}/Version
${OPENTHREADS_CONFIG_HEADER}
) )
# User Options # User Options
@ -69,12 +82,5 @@ ELSE(WIN32)
ENDIF(UNIX) ENDIF(UNIX)
ENDIF(WIN32) ENDIF(WIN32)
INCLUDE(CheckAtomicOps)
SET(OPENTHREADS_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/OpenThreads/Config")
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/common/Config.in"
"${OPENTHREADS_CONFIG_HEADER}")
INSTALL_FILES(/include/OpenThreads/ FILES "${OPENTHREADS_CONFIG_HEADER}")
# Make sure everyone can find Config # Make sure everyone can find Config
INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include) INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include)

2
src/osg/CMakeLists.txt
View File

@ -37,7 +37,6 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/ColorMask ${HEADER_PATH}/ColorMask
${HEADER_PATH}/ColorMatrix ${HEADER_PATH}/ColorMatrix
${HEADER_PATH}/ComputeBoundsVisitor ${HEADER_PATH}/ComputeBoundsVisitor
${HEADER_PATH}/Config
${HEADER_PATH}/ConvexPlanarOccluder ${HEADER_PATH}/ConvexPlanarOccluder
${HEADER_PATH}/ConvexPlanarPolygon ${HEADER_PATH}/ConvexPlanarPolygon
${HEADER_PATH}/CoordinateSystemNode ${HEADER_PATH}/CoordinateSystemNode
@ -170,6 +169,7 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/VertexProgram ${HEADER_PATH}/VertexProgram
${HEADER_PATH}/View ${HEADER_PATH}/View
${HEADER_PATH}/Viewport ${HEADER_PATH}/Viewport
${OPENSCENEGRAPH_CONFIG_HEADER}
) )
ADD_LIBRARY(${LIB_NAME} ADD_LIBRARY(${LIB_NAME}