Revision: 8876
          http://playerstage.svn.sourceforge.net/playerstage/?rev=8876&view=rev
Author:   hsujohnhsu
Date:     2010-09-02 02:46:28 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
adding QUICKSTEP_EXPERIMENTAL for experimental things in ode pending opende 
version minor .68: islandThreads, quickStepThreads, quickStepChunks, 
quickStepOverlap and quickStepTolerance.

Modified Paths:
--------------
    code/gazebo/branches/wg/cmake/SearchForStuff.cmake
    code/gazebo/branches/wg/gazebo_config.h.in

Modified: code/gazebo/branches/wg/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/branches/wg/cmake/SearchForStuff.cmake  2010-09-02 02:23:24 UTC 
(rev 8875)
+++ code/gazebo/branches/wg/cmake/SearchForStuff.cmake  2010-09-02 02:46:28 UTC 
(rev 8876)
@@ -71,13 +71,15 @@
   ENDIF (NOT ODE_FOUND)
 
   # patched ode version with joint damping
-  SET(ODE_JOINT_DAMPING_VERSION 0.11.1.68 CACHE INTERNAL "ODE version with 
joint damping" FORCE)
-  pkg_check_modules(ODE_JOINT_DAMPING ode>=${ODE_JOINT_DAMPING_VERSION})
-  IF (NOT ODE_JOINT_DAMPING_FOUND)
+  SET(ODE_WG_PATCHES_VERSION 0.11.1.68 CACHE INTERNAL "ODE version with joint 
damping" FORCE)
+  pkg_check_modules(ODE_WG_PATCHES ode>=${ODE_WG_PATCHES_VERSION})
+  IF (NOT ODE_WG_PATCHES_FOUND)
     SET (INCLUDE_ODE_JOINT_DAMPING FALSE CACHE BOOL "No support for ODE 
damping")
-  ELSE (NOT ODE_JOINT_DAMPING_FOUND)
+    SET (QUICKSTEP_EXPERIMENTAL FALSE CACHE BOOL "support for ODE quickstep 
experimental stuff")
+  ELSE (NOT ODE_WG_PATCHES_FOUND)
     SET (INCLUDE_ODE_JOINT_DAMPING TRUE CACHE BOOL "Include support for ODE 
damping")
-  ENDIF (NOT ODE_JOINT_DAMPING_FOUND)
+    SET (QUICKSTEP_EXPERIMENTAL TRUE CACHE BOOL "support for ODE quickstep 
experimental stuff")
+  ENDIF (NOT ODE_WG_PATCHES_FOUND)
 
   #################################################
   # Find OGRE 

Modified: code/gazebo/branches/wg/gazebo_config.h.in
===================================================================
--- code/gazebo/branches/wg/gazebo_config.h.in  2010-09-02 02:23:24 UTC (rev 
8875)
+++ code/gazebo/branches/wg/gazebo_config.h.in  2010-09-02 02:46:28 UTC (rev 
8876)
@@ -15,4 +15,6 @@
 #cmakedefine INCLUDE_BULLET 1
 #cmakedefine INCLUDE_ODE 1
 #cmakedefine INCLUDE_ODE_JOINT_DAMPING 1
+#cmakedefine QUICKSTEP_EXPERIMENTAL 1
 #cmakedefine INCLUDE_RTSHADER 1
+#cmakedefine ENABLE_TIMERS 1


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:

Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit

Reply via email to