Changeset 8477

Timestamp:

06/20/08 17:50:53 (21 months ago)

Author:

robert

Message:

From Mathias Froehlich, moved optional config variables into include/osg/Config file that
is automatically created by cmake according to its own settings.

Location:

OpenSceneGraph/trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• include/osg/BoundingBox (modified) (2 diffs)
• include/osg/BoundingSphere (modified) (2 diffs)
• include/osg/Matrix (modified) (1 diff)
• include/osg/Plane (modified) (1 diff)
• src/osg/CMakeLists.txt (modified) (11 diffs)
• src/osg/Config.in (added)

OpenSceneGraph/trunk/CMakeLists.txt

@@ -185 +185 @@
 OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float Matrix instead of double." OFF)
 MARK_AS_ADVANCED(OSG_USE_FLOAT_MATRIX)
-IF(OSG_USE_FLOAT_MATRIX)
-    ADD_DEFINITIONS(-DOSG_USE_FLOAT_MATRIX)
-ENDIF(OSG_USE_FLOAT_MATRIX)
 
 OPTION(OSG_USE_FLOAT_PLANE "Set to ON to build OpenSceneGraph with float Plane instead of double." OFF)
 MARK_AS_ADVANCED(OSG_USE_FLOAT_PLANE)
-IF(OSG_USE_FLOAT_PLANE)
-    ADD_DEFINITIONS(-DOSG_USE_FLOAT_PLANE)
-ENDIF(OSG_USE_FLOAT_PLANE)
 
 OPTION(OSG_USE_FLOAT_BOUNDINGSPHERE "Set to ON to build OpenSceneGraph with float BoundingSphere instead of double." ON)
 MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGSPHERE)
-IF(NOT OSG_USE_FLOAT_BOUNDINGSPHERE)
-    ADD_DEFINITIONS(-DOSG_USE_DOUBLE_BOUNDINGSPHERE)
-ENDIF(NOT OSG_USE_FLOAT_BOUNDINGSPHERE)
 
 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)
-IF(NOT OSG_USE_FLOAT_BOUNDINGBOX)
-    ADD_DEFINITIONS(-DOSG_USE_DOUBLE_BOUNDINGBOX)
-ENDIF(NOT OSG_USE_FLOAT_BOUNDINGBOX)
 
 ################################################################################
@@ -597 +585 @@
 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/include/osg/BoundingBox

@@ -15 +15 @@
 #define OSG_BOUNDINGBOX 1
 
+#include <osg/Config>
 #include <osg/Export>
 #include <osg/Vec3>
@@ -32 +33 @@
     public:
     
-#ifdef OSG_USE_DOUBLE_BOUNDINGBOX
+#ifdef OSG_USE_FLOAT_BOUNDINGBOX
+        typedef Vec3f vec_type;
+        typedef float value_type;
+#else
         typedef Vec3d vec_type;
         typedef double value_type;
-#else
-        typedef Vec3f vec_type;
-        typedef float value_type;
 #endif
 

OpenSceneGraph/trunk/include/osg/BoundingSphere

@@ -15 +15 @@
 #define OSG_BOUNDINGSPHERE 1
 
+#include <osg/Config>
 #include <osg/Export>
 #include <osg/Vec3f>
@@ -33 +34 @@
     public:
 
-#ifdef OSG_USE_DOUBLE_BOUNDINGSPHERE
+#ifdef OSG_USE_FLOAT_BOUNDINGSPHERE
+        typedef Vec3f vec_type;
+        typedef float value_type;
+#else
         typedef Vec3d vec_type;
         typedef double value_type;
-#else
-        typedef Vec3f vec_type;
-        typedef float value_type;
 #endif
         

OpenSceneGraph/trunk/include/osg/Matrix

@@ -15 +15 @@
 #define OSG_MATRIX 1
 
+#include <osg/Config>
 #include <osg/Matrixd>
 #include <osg/Matrixf>

OpenSceneGraph/trunk/include/osg/Plane

@@ -15 +15 @@
 #define OSG_PLANE 1
 
+#include <osg/Config>
 #include <osg/Export>
 #include <osg/Vec3>

OpenSceneGraph/trunk/src/osg/CMakeLists.txt

@@ -24 +24 @@
     ${HEADER_PATH}/BoundingSphere
     ${HEADER_PATH}/BoundsChecking
+    ${HEADER_PATH}/buffered_value
     ${HEADER_PATH}/BufferObject
     ${HEADER_PATH}/Camera
@@ -37 +38 @@
     ${HEADER_PATH}/ColorMatrix
     ${HEADER_PATH}/ComputeBoundsVisitor
+    ${HEADER_PATH}/Config
     ${HEADER_PATH}/ConvexPlanarOccluder
     ${HEADER_PATH}/ConvexPlanarPolygon
@@ -42 +44 @@
     ${HEADER_PATH}/CopyOp
     ${HEADER_PATH}/CullFace
+    ${HEADER_PATH}/CullingSet
     ${HEADER_PATH}/CullSettings
     ${HEADER_PATH}/CullStack
-    ${HEADER_PATH}/CullingSet
     ${HEADER_PATH}/DeleteHandler
     ${HEADER_PATH}/Depth
     ${HEADER_PATH}/DisplaySettings
+    ${HEADER_PATH}/Drawable
     ${HEADER_PATH}/DrawPixels
-    ${HEADER_PATH}/Drawable
     ${HEADER_PATH}/Endian
     ${HEADER_PATH}/Export
+    ${HEADER_PATH}/fast_back_stack
     ${HEADER_PATH}/Fog
     ${HEADER_PATH}/FragmentProgram
@@ -57 +60 @@
     ${HEADER_PATH}/FrameStamp
     ${HEADER_PATH}/FrontFace
+    ${HEADER_PATH}/Geode
+    ${HEADER_PATH}/Geometry
     ${HEADER_PATH}/GL
     ${HEADER_PATH}/GL2Extensions
@@ -62 +67 @@
     ${HEADER_PATH}/GLObjects
     ${HEADER_PATH}/GLU
-    ${HEADER_PATH}/Geode
-    ${HEADER_PATH}/Geometry
     ${HEADER_PATH}/GraphicsContext
     ${HEADER_PATH}/GraphicsThread
@@ -70 +73 @@
     ${HEADER_PATH}/Image
     ${HEADER_PATH}/ImageStream
-    ${HEADER_PATH}/LOD
+    ${HEADER_PATH}/io_utils
     ${HEADER_PATH}/Light
     ${HEADER_PATH}/LightModel
@@ -77 +80 @@
     ${HEADER_PATH}/LineStipple
     ${HEADER_PATH}/LineWidth
+    ${HEADER_PATH}/LOD
     ${HEADER_PATH}/LogicOp
     ${HEADER_PATH}/Material
     ${HEADER_PATH}/Math
     ${HEADER_PATH}/Matrix
-    ${HEADER_PATH}/MatrixTransform
     ${HEADER_PATH}/Matrixd
     ${HEADER_PATH}/Matrixf
+    ${HEADER_PATH}/MatrixTransform
     ${HEADER_PATH}/Multisample
     ${HEADER_PATH}/Node
@@ -91 +95 @@
     ${HEADER_PATH}/Notify
     ${HEADER_PATH}/Object
+    ${HEADER_PATH}/observer_ptr
     ${HEADER_PATH}/OccluderNode
     ${HEADER_PATH}/OcclusionQueryNode
@@ -109 +114 @@
     ${HEADER_PATH}/Quat
     ${HEADER_PATH}/Referenced
+    ${HEADER_PATH}/ref_ptr
     ${HEADER_PATH}/RenderInfo
     ${HEADER_PATH}/Scissor
@@ -139 +145 @@
     ${HEADER_PATH}/TextureRectangle
     ${HEADER_PATH}/Timer
+    ${HEADER_PATH}/TransferFunction
     ${HEADER_PATH}/Transform
     ${HEADER_PATH}/TriangleFunctor
     ${HEADER_PATH}/TriangleIndexFunctor
-    ${HEADER_PATH}/TransferFunction
     ${HEADER_PATH}/Uniform
     ${HEADER_PATH}/Vec2
@@ -164 +170 @@
     ${HEADER_PATH}/View
     ${HEADER_PATH}/Viewport
-    ${HEADER_PATH}/buffered_value
-    ${HEADER_PATH}/fast_back_stack
-    ${HEADER_PATH}/io_utils
-    ${HEADER_PATH}/observer_ptr
-    ${HEADER_PATH}/ref_ptr
 )