Revision: 8725
http://playerstage.svn.sourceforge.net/playerstage/?rev=8725&view=rev
Author: natepak
Date: 2010-05-28 16:58:40 +0000 (Fri, 28 May 2010)
Log Message:
-----------
update the ode cmake
Modified Paths:
--------------
code/gazebo/branches/simpar/cmake/SearchForStuff.cmake
Removed Paths:
-------------
code/gazebo/branches/simpar/cmake/FindOde.cmake
Deleted: code/gazebo/branches/simpar/cmake/FindOde.cmake
===================================================================
--- code/gazebo/branches/simpar/cmake/FindOde.cmake 2010-05-28 16:30:17 UTC
(rev 8724)
+++ code/gazebo/branches/simpar/cmake/FindOde.cmake 2010-05-28 16:58:40 UTC
(rev 8725)
@@ -1,76 +0,0 @@
-include (${gazebo_cmake_dir}/GazeboUtils.cmake)
-include (FindPkgConfig)
-
-SET(REQUIRED_ODE_VERSION ${ODE_VERSION})
-
-# John - ode version with joint damping
-SET(ODE_JOINT_DAMPING_VERSION 0.11.1.1 CACHE INTERNAL "ODE version with joint
damping" FORCE)
-
-########################################
-# Find packages
-IF (PKG_CONFIG_FOUND)
- pkg_check_modules(ODE ode>=${ODE_VERSION})
- pkg_check_modules(ODE_JOINT_DAMPING ode>=${ODE_JOINT_DAMPING_VERSION})
-ENDIF (PKG_CONFIG_FOUND)
-
-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)
-
-# if we didnt find it in pkg-config try ode-config
-#IF (NOT ODE_FOUND)
-# SET(ODE_CONFIG_PATH "ode-config")
-# EXEC_PROGRAM(${ODE_CONFIG_PATH} ARGS --version RETURN_VALUE
ODE_CONFIG_RETURN OUTPUT_VARIABLE DETECTED_ODE_VERSION )
-# STRING(REGEX REPLACE "[\r\n]" " " ${DETECTED_ODE_VERSION}
"${${DETECTED_ODE_VERSION}}")
-#
-# # ode-config exists then get the details
-# IF(NOT ODE_CONFIG_RETURN)
-# IF(NOT ${REQUIRED_ODE_VERSION} VERSION_LESS ${DETECTED_ODE_VERSION} )
-# MESSAGE(STATUS " ode-config reports version ${DETECTED_ODE_VERSION}")
-# EXEC_PROGRAM(${ODE_CONFIG_PATH} ARGS --cflags RETURN_VALUE
ODE_CONFIG_RETURN OUTPUT_VARIABLE ODE_INCLUDE_DIRS )
-# STRING(REGEX REPLACE "[\r\n]" " " ${ODE_INCLUDE_DIRS}
"${${ODE_INCLUDE_DIRS}}")
-#
-# # we want to extract -DdSINGLE or -DdDOUBLE to compile with the correct
flag
-# STRING(REGEX REPLACE ".*-Dd([^ ]+).*" "-Dd\\1" ODE_CFLAGS_OTHER
"${ODE_INCLUDE_DIRS}")
-# MESSAGE(STATUS "${ODE_CFLAGS_OTHER} used to compile against the ODE
library")
-#
-# EXEC_PROGRAM(${ODE_CONFIG_PATH} ARGS --libs RETURN_VALUE
ODE_CONFIG_RETURN OUTPUT_VARIABLE ODE_LDFLAGS )
-# STRING(REGEX REPLACE "[\r\n]" " " ${ODE_LDFLAGS} "${${ODE_LDFLAGS}}")
-#
-# SET(ODE_FOUND ${DETECTED_ODE_VERSION})
-# ELSE(NOT ${REQUIRED_ODE_VERSION} VERSION_LESS ${DETECTED_ODE_VERSION} )
-# MESSAGE(STATUS "ode-config reports wrong version
(${DETECTED_ODE_VERSION} < ${REQUIRED_ODE_VERSION})")
-# ENDIF(NOT ${REQUIRED_ODE_VERSION} VERSION_LESS ${DETECTED_ODE_VERSION} )
-# ELSE(NOT ODE_CONFIG_RETURN)
-# MESSAGE(STATUS "no ode-config found")
-# ENDIF(NOT ODE_CONFIG_RETURN)
-#ENDIF (NOT ODE_FOUND)
-
-IF (NOT ODE_FOUND)
- BUILD_ERROR ("ODE and development files not found. See the following
website: http://www.ode.org";)
- SET (INCLUDE_ODE FALSE CACHE BOOL "Include support for ODE")
-ELSE (NOT ODE_FOUND)
- SET (INCLUDE_ODE TRUE CACHE BOOL "Include support for ODE")
-
- #APPEND_TO_CACHED_LIST(gazeboserver_cflags
- # ${gazeboserver_cflags_desc}
- # ${ODE_CFLAGS_OTHER})
-
- APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
- ${gazeboserver_include_dirs_desc}
- ${ODE_INCLUDE_DIRS})
- APPEND_TO_CACHED_LIST(gazeboserver_link_dirs
- ${gazeboserver_link_dirs_desc}
- ${ODE_LIBRARY_DIRS})
- APPEND_TO_CACHED_LIST(gazeboserver_link_libs
- ${gazeboserver_link_libs_desc}
- ${ODE_LINK_LIBS})
- APPEND_TO_CACHED_LIST(gazeboserver_link_libs
- ${gazeboserver_link_libs_desc}
- ${ODE_LIBRARIES})
- APPEND_TO_CACHED_LIST(gazeboserver_ldflags
- ${gazeboserver_ldflags_desc}
- ${ODE_LDFLAGS})
-ENDIF (NOT ODE_FOUND)
Modified: code/gazebo/branches/simpar/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/branches/simpar/cmake/SearchForStuff.cmake 2010-05-28
16:30:17 UTC (rev 8724)
+++ code/gazebo/branches/simpar/cmake/SearchForStuff.cmake 2010-05-28
16:58:40 UTC (rev 8725)
@@ -1,6 +1,9 @@
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 (use_internal_assimp OFF CACHE BOOL "Use internal assimp" FORCE)
set (INCLUDE_WEBGAZEBO ON CACHE BOOL "Build webgazebo" FORCE)
@@ -28,7 +31,6 @@
include (${gazebo_cmake_dir}/FindOS.cmake)
include (FindPkgConfig)
-include (${gazebo_cmake_dir}/FindOde.cmake)
include (${gazebo_cmake_dir}/FindFreeimage.cmake)
@@ -48,6 +50,40 @@
#################################################
+ # Find ODE
+ pkg_check_modules(ODE ode>=${ODE_VERSION})
+ IF (NOT ODE_FOUND)
+ BUILD_ERROR ("ODE and development files not found. See the following
website: http://www.ode.org";)
+ set (INCLUDE_ODE FALSE CACHE BOOL "Include support for ODE")
+ else (NOT ODE_FOUND)
+ set (INCLUDE_ODE TRUE CACHE BOOL "Include support for ODE")
+
+ APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
+ ${gazeboserver_include_dirs_desc}
+ ${ODE_INCLUDE_DIRS})
+ APPEND_TO_CACHED_LIST(gazeboserver_link_dirs
+ ${gazeboserver_link_dirs_desc}
+ ${ODE_LIBRARY_DIRS})
+ APPEND_TO_CACHED_LIST(gazeboserver_link_libs
+ ${gazeboserver_link_libs_desc}
+ ${ODE_LINK_LIBS})
+ APPEND_TO_CACHED_LIST(gazeboserver_link_libs
+ ${gazeboserver_link_libs_desc}
+ ${ODE_LIBRARIES})
+ APPEND_TO_CACHED_LIST(gazeboserver_ldflags
+ ${gazeboserver_ldflags_desc}
+ ${ODE_LDFLAGS})
+ endif (NOT ODE_FOUND)
+
+ 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})
if (OGRE-RTShaderSystem_FOUND)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
