Revision: 8722
http://playerstage.svn.sourceforge.net/playerstage/?rev=8722&view=rev
Author: natepak
Date: 2010-05-28 16:25:10 +0000 (Fri, 28 May 2010)
Log Message:
-----------
Simplified finding ODE
Modified Paths:
--------------
code/gazebo/trunk/cmake/SearchForStuff.cmake
Removed Paths:
-------------
code/gazebo/trunk/cmake/FindOde.cmake
Deleted: code/gazebo/trunk/cmake/FindOde.cmake
===================================================================
--- code/gazebo/trunk/cmake/FindOde.cmake 2010-05-28 16:20:21 UTC (rev
8721)
+++ code/gazebo/trunk/cmake/FindOde.cmake 2010-05-28 16:25:10 UTC (rev
8722)
@@ -1,65 +0,0 @@
-INCLUDE (FindPkgConfig)
-
-SET(REQUIRED_ODE_VERSION ${ODE_VERSION})
-
-########################################
-# Find packages
-IF (PKG_CONFIG_FOUND)
- pkg_check_modules(ODE ode>=${ODE_VERSION})
-ENDIF (PKG_CONFIG_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/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-05-28 16:20:21 UTC
(rev 8721)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-05-28 16:25:10 UTC
(rev 8722)
@@ -28,7 +28,6 @@
include (${gazebo_cmake_dir}/FindOS.cmake)
include (FindPkgConfig)
-include (${gazebo_cmake_dir}/FindOde.cmake)
include (${gazebo_cmake_dir}/FindFreeimage.cmake)
@@ -125,6 +124,32 @@
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
pkg_check_modules(XPM xpm)
if (NOT XPM_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
