Revision: 8863
http://playerstage.svn.sourceforge.net/playerstage/?rev=8863&view=rev
Author: hsujohnhsu
Date: 2010-09-02 00:42:57 +0000 (Thu, 02 Sep 2010)
Log Message:
-----------
cmake check for ODE damping version
Modified Paths:
--------------
code/gazebo/branches/wg/cmake/SearchForStuff.cmake
code/gazebo/branches/wg/config.h.in
Modified: code/gazebo/branches/wg/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/branches/wg/cmake/SearchForStuff.cmake 2010-09-02 00:39:09 UTC
(rev 8862)
+++ code/gazebo/branches/wg/cmake/SearchForStuff.cmake 2010-09-02 00:42:57 UTC
(rev 8863)
@@ -1,9 +1,6 @@
include (${gazebo_cmake_dir}/GazeboUtils.cmake)
include (CheckCXXSourceCompiles)
-# John - ode version with joint damping
-SET(ODE_JOINT_DAMPING_VERSION 0.11.1.1 CACHE INTERNAL "ODE version with joint
damping" FORCE)
-
set (INCLUDE_WEBGAZEBO ON CACHE BOOL "Build webgazebo" FORCE)
set (OGRE_LIBRARY_PATH "/usr/local/lib" CACHE INTERNAL "Ogre library path")
@@ -73,6 +70,15 @@
${ODE_LDFLAGS})
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 (INCLUDE_ODE_JOINT_DAMPING FALSE CACHE BOOL "No support for ODE
damping")
+ ELSE (NOT ODE_JOINT_DAMPING_FOUND)
+ SET (INCLUDE_ODE_JOINT_DAMPING TRUE CACHE BOOL "Include support for ODE
damping")
+ ENDIF (NOT ODE_JOINT_DAMPING_FOUND)
+
#################################################
# Find OGRE
pkg_check_modules(OGRE-RTShaderSystem
OGRE-RTShaderSystem>=${MIN_OGRE_VERSION})
Modified: code/gazebo/branches/wg/config.h.in
===================================================================
--- code/gazebo/branches/wg/config.h.in 2010-09-02 00:39:09 UTC (rev 8862)
+++ code/gazebo/branches/wg/config.h.in 2010-09-02 00:42:57 UTC (rev 8863)
@@ -14,3 +14,4 @@
#cmakedefine ENABLE_SHADOWS 1
#cmakedefine INCLUDE_BULLET 1
#cmakedefine INCLUDE_ODE 1
+#cmakedefine INCLUDE_ODE_JOINT_DAMPING 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
