Changeset 8482

Timestamp:

06/20/08 21:52:14 (4 years ago)

Author:

robert

Message:

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

Location:

OpenSceneGraph/trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• src/OpenThreads/CMakeLists.txt (modified) (3 diffs)
• src/osg/CMakeLists.txt (modified) (2 diffs)

OpenSceneGraph/trunk/CMakeLists.txt

@@ -194 +194 @@
 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)
+
+
+################################################################################
+# 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}")
+
 
 ################################################################################
@@ -585 +595 @@
 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
 # advantage of this.

OpenSceneGraph/trunk/src/OpenThreads/CMakeLists.txt

@@ -9 +9 @@
 
 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)
@@ -23 +35 @@
     ${HEADER_PATH}/Thread
     ${HEADER_PATH}/Version
+    ${OPENTHREADS_CONFIG_HEADER}
 )
 
@@ -70 +83 @@
 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
 INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include)

OpenSceneGraph/trunk/src/osg/CMakeLists.txt

@@ -38 +38 @@
     ${HEADER_PATH}/ColorMatrix
     ${HEADER_PATH}/ComputeBoundsVisitor
-    ${HEADER_PATH}/Config
     ${HEADER_PATH}/ConvexPlanarOccluder
     ${HEADER_PATH}/ConvexPlanarPolygon
@@ -171 +170 @@
     ${HEADER_PATH}/View
     ${HEADER_PATH}/Viewport
+    ${OPENSCENEGRAPH_CONFIG_HEADER}
 )