Changeset 910

Timestamp:

04/03/08 20:45:26

Author:

robert

Message:

Added check for Matrix types etc.

Update version for next dev version

Files:

• trunk/CMakeLists.txt (modified) (2 diffs)
• trunk/include/vpb/Version (modified) (1 diff)

trunk/CMakeLists.txt

@@ -17 +17 @@
-SET(VIRTUALPLANETBUILDER_MAJOR_VERSION 0)
-SET(VIRTUALPLANETBUILDER_MINOR_VERSION 9)
-7
-6
+8
+7
-
-SET(VIRTUALPLANETBUILDER_VERSION ${VIRTUALPLANETBUILDER_MAJOR_VERSION}.${VIRTUALPLANETBUILDER_MINOR_VERSION}.${VIRTUALPLANETBUILDER_PATCH_VERSION})
@@ -164 +164 @@
-# This is unofficial so this may be removed or changed at anytime.
-SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} CACHE STRING "(EXPERIMENTAL) You may add additional search paths here. Use ; to separate multiple paths.")
+
+
+# Automatically detected build options
+EXEC_PROGRAM(osgversion ARGS Matrix::value_type OUTPUT_VARIABLE OSG_USE_FLOAT_MATRIX)
+IF(OSG_USE_FLOAT_MATRIX MATCHES "float")        
+    ADD_DEFINITIONS(-DOSG_USE_FLOAT_MATRIX)
+ENDIF(OSG_USE_FLOAT_MATRIX MATCHES "float")        
+
+EXEC_PROGRAM(osgversion ARGS Plane::value_type OUTPUT_VARIABLE OSG_USE_FLOAT_PLANE)
+IF(OSG_USE_FLOAT_PLANE MATCHES "float")        
+    ADD_DEFINITIONS(-DOSG_USE_FLOAT_PLANE)
+ENDIF(OSG_USE_FLOAT_PLANE MATCHES "float")        
+
+EXEC_PROGRAM(osgversion ARGS BoundingSphere::value_type  OUTPUT_VARIABLE OSG_USE_FLOAT_BOUNDINGSPHERE)
+IF(OSG_USE_FLOAT_BOUNDINGSPHERE MATCHES "double")        
+    ADD_DEFINITIONS(-DOSG_USE_DOUBLE_BOUNDINGSPHERE)
+ENDIF(OSG_USE_FLOAT_BOUNDINGSPHERE MATCHES "double")        
+
+EXEC_PROGRAM(osgversion ARGS BoundingBox::value_type OUTPUT_VARIABLE OSG_USE_FLOAT_BOUNDINGBOX)
+IF(OSG_USE_FLOAT_BOUNDINGBOX MATCHES "double")        
+    ADD_DEFINITIONS(-DOSG_USE_DOUBLE_BOUNDINGBOX)
+ENDIF(OSG_USE_FLOAT_BOUNDINGBOX MATCHES "double")        
-
-

trunk/include/vpb/Version

@@ -21 +21 @@
-#define VPB_VERSION_MAJOR       0
-#define VPB_VERSION_MINOR       9
-7
-6
+8
+7
-
-/**