Revision: 8824
http://playerstage.svn.sourceforge.net/playerstage/?rev=8824&view=rev
Author: hsujohnhsu
Date: 2010-07-13 20:25:09 +0000 (Tue, 13 Jul 2010)
Log Message:
-----------
remove repeats of cmake find ode block
Modified Paths:
--------------
code/gazebo/trunk/cmake/SearchForStuff.cmake
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-07-09 13:44:53 UTC
(rev 8823)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-07-13 20:25:09 UTC
(rev 8824)
@@ -49,12 +49,12 @@
#################################################
# Find ODE
- pkg_check_modules(ODE 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")
+ 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}
@@ -71,16 +71,8 @@
APPEND_TO_CACHED_LIST(gazeboserver_ldflags
${gazeboserver_ldflags_desc}
${ODE_LDFLAGS})
- endif (NOT ODE_FOUND)
+ 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})
@@ -160,31 +152,6 @@
ENDIF (NOT XML_FOUND)
- ########################################
- # 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)
########################################
# Find libXPM
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
