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

src/OpenThreads/CMakeLists.txt

@@ -9,6 +9,18 @@ SET(OPENTHREADS_SOVERSION 11)
 
 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(OpenThreads_PUBLIC_HEADERS
     ${HEADER_PATH}/Atomic
@@ -22,6 +34,7 @@ SET(OpenThreads_PUBLIC_HEADERS
     ${HEADER_PATH}/ScopedLock  
     ${HEADER_PATH}/Thread
     ${HEADER_PATH}/Version
+    ${OPENTHREADS_CONFIG_HEADER}
 )
 
 # User Options
@@ -69,12 +82,5 @@ ELSE(WIN32)
     ENDIF(UNIX)
 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)

src/osg/CMakeLists.txt

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