Revision: 7898
          http://playerstage.svn.sourceforge.net/playerstage/?rev=7898&view=rev
Author:   thjc
Date:     2009-06-25 09:49:33 +0000 (Thu, 25 Jun 2009)

Log Message:
-----------
Fixes in preparation for a deb package:
split some cmake searches into sepearte files for sanity
updated some cmake checks to work with Ubuntu Karmic
some gcc 4.4 build fixes
added sonames to the library output

Modified Paths:
--------------
    code/gazebo/trunk/CMakeLists.txt
    code/gazebo/trunk/cmake/SearchForStuff.cmake
    code/gazebo/trunk/libgazebo/CMakeLists.txt
    code/gazebo/trunk/libgazebo/SimIface.cc
    code/gazebo/trunk/server/CMakeLists.txt
    code/gazebo/trunk/server/audio_video/CMakeLists.txt
    code/gazebo/trunk/server/gui/CMakeLists.txt
    code/gazebo/trunk/server/sensors/contact/ContactSensor.hh

Added Paths:
-----------
    code/gazebo/trunk/cmake/FindFreeimage.cmake
    code/gazebo/trunk/cmake/FindOS.cmake
    code/gazebo/trunk/cmake/FindOde.cmake

Property Changed:
----------------
    code/gazebo/trunk/


Property changes on: code/gazebo/trunk
___________________________________________________________________
Modified: svn:ignore
   - *.os
config.log
.sconsign.dblite
*.so
*.a
.sconf_temp
Ogre.log
CEGUI.log
gazebo
Doxyfile
gazeborc
libgazeboServer.pc
.settings
.cproject
.project
.scons

   + *.os
config.log
.sconsign.dblite
*.so
*.a
.sconf_temp
Ogre.log
CEGUI.log
gazebo
Doxyfile
gazeborc
libgazeboServer.pc
.settings
.cproject
.project
.scons
build


Modified: code/gazebo/trunk/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/CMakeLists.txt    2009-06-25 01:17:47 UTC (rev 7897)
+++ code/gazebo/trunk/CMakeLists.txt    2009-06-25 09:49:33 UTC (rev 7898)
@@ -30,7 +30,7 @@
 SET (gazebocontroller_sources_desc "List of controller sources" 
      CACHE INTERNAL "Gazebo controller sources list description" FORCE)
 
-SET (OGRE_VERSION 1.6.2 CACHE INTERNAL "Ogre version requirement" FORCE)
+SET (OGRE_VERSION 1.6.1 CACHE INTERNAL "Ogre version requirement" FORCE)
 
 SET (FREEIMAGE_MAJOR_VERSION 3 CACHE INTERNAL "FreeImage major version 
requirement" FORCE)
 SET (FREEIMAGE_MINOR_VERSION 10 CACHE INTERNAL "FreeImage minor version 
requirement" FORCE)

Added: code/gazebo/trunk/cmake/FindFreeimage.cmake
===================================================================
--- code/gazebo/trunk/cmake/FindFreeimage.cmake                         (rev 0)
+++ code/gazebo/trunk/cmake/FindFreeimage.cmake 2009-06-25 09:49:33 UTC (rev 
7898)
@@ -0,0 +1,61 @@
+INCLUDE (FindPkgConfig)
+
+SET (freeimage_include_dir "/usr/include/" CACHE STRING "FreeImage include 
paths")
+SET (freeimage_library_dir "/usr/lib" CACHE STRING "FreeImage library paths")
+SET (freeimage_library "freeimage" CACHE STRING "FreeImage library")
+
+########################################
+# Find packages
+IF (PKG_CONFIG_FOUND)
+  pkg_check_modules(FI freeimage>=${FREEIMAGE_VERSION})
+  IF (NOT FI_FOUND)
+    MESSAGE (STATUS "  freeimage.pc not found, trying freeimage_include_dir 
and freeimage_library_dir flags.")
+  ENDIF (NOT FI_FOUND)
+ENDIF (PKG_CONFIG_FOUND)
+
+IF (NOT FI_FOUND)
+  FIND_PATH(freeimage_include_dir FreeImage.h ${freeimage_include_dir})
+  IF (NOT freeimage_include_dir)
+    MESSAGE (STATUS "  Looking for FreeImage.h - not found")
+    MESSAGE (FATAL_ERROR "  Unable to find FreeImage.h")
+  ELSE (NOT freeimage_include_dir)
+
+    # Check the FreeImage header for the right version
+    SET (testFreeImageSource 
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/test_freeimage.cc)
+    FILE (WRITE ${testFreeImageSource} 
+      "#include <FreeImage.h>\nint main () { if (FREEIMAGE_MAJOR_VERSION >= 
${FREEIMAGE_MAJOR_VERSION} && FREEIMAGE_MINOR_VERSION >= 
${FREEIMAGE_MINOR_VERSION}) return 1; else return 0;} \n")
+    TRY_RUN(FREEIMAGE_RUNS FREEIMAGE_COMPILES ${CMAKE_CURRENT_BINARY_DIR} 
+                ${testFreeImageSource})
+    IF (NOT FREEIMAGE_RUNS)
+      MESSAGE (FATAL_ERROR "  Invalid FreeImage Version. Requires 
${FREEIMAGE_VERSION}")
+    ELSE (NOT FREEIMAGE_RUNS)
+       MESSAGE (STATUS "  Looking for FreeImage.h - found")
+    ENDIF (NOT FREEIMAGE_RUNS)
+
+  ENDIF (NOT freeimage_include_dir)
+
+  FIND_LIBRARY(freeimage_library freeimage ${freeimage_library_dir})
+  IF (NOT freeimage_library)
+    MESSAGE (STATUS "  Looking for libfreeimage - not found")
+    MESSAGE (FATAL_ERROR "  Unable to find libfreeimage")
+  ELSE (NOT freeimage_library)
+    MESSAGE (STATUS "  Looking for libfreeimage - found")
+  ENDIF (NOT freeimage_library)
+
+ELSE (NOT FI_FOUND)
+  APPEND_TO_CACHED_LIST(gazeboserver_include_dirs 
+                        ${gazeboserver_include_dirs_desc} 
+                        ${FI_INCLUDE_DIRS})
+  APPEND_TO_CACHED_LIST(gazeboserver_link_dirs 
+                        ${gazeboserver_link_dirs_desc} 
+                        ${FI_LIBRARY_DIRS})
+  APPEND_TO_CACHED_LIST(gazeboserver_link_libs 
+                        ${gazeboserver_link_libs_desc} 
+                        ${FI_LINK_LIBS})
+  APPEND_TO_CACHED_LIST(gazeboserver_link_libs 
+                        ${gazeboserver_link_libs_desc} 
+                        ${FI_LIBRARIES})
+  APPEND_TO_CACHED_LIST(gazeboserver_link_libs 
+                        ${gazeboserver_link_libs_desc} 
+                        ${FI_LDFLAGS})
+ENDIF (NOT FI_FOUND)
\ No newline at end of file

Added: code/gazebo/trunk/cmake/FindOS.cmake
===================================================================
--- code/gazebo/trunk/cmake/FindOS.cmake                                (rev 0)
+++ code/gazebo/trunk/cmake/FindOS.cmake        2009-06-25 09:49:33 UTC (rev 
7898)
@@ -0,0 +1,45 @@
+# Check the OS type.
+
+# CMake does not distinguish Linux from other Unices.
+STRING (REGEX MATCH "Linux" PLAYER_OS_LINUX ${CMAKE_SYSTEM_NAME})
+# Nor *BSD
+STRING (REGEX MATCH "BSD" PLAYER_OS_BSD ${CMAKE_SYSTEM_NAME})
+# Or Solaris. I'm seeing a trend, here
+STRING (REGEX MATCH "SunOS" PLAYER_OS_SOLARIS ${CMAKE_SYSTEM_NAME})
+
+# Windows is easy (for once)
+IF (WIN32)
+    SET (PLAYER_OS_WIN TRUE BOOL INTERNAL)
+ENDIF (WIN32)
+
+# Check if it's an Apple OS
+IF (APPLE)
+    # Check if it's OS X or another MacOS (that's got to be pretty unlikely)
+    STRING (REGEX MATCH "Darwin" PLAYER_OS_OSX ${CMAKE_SYSTEM_NAME})
+    IF (NOT PLAYER_OS_OSX)
+        SET (PLAYER_OS_MACOS TRUE BOOL INTERNAL)
+    ENDIF (NOT PLAYER_OS_OSX)
+ENDIF (APPLE)
+
+# QNX
+IF (QNXNTO)
+    SET (PLAYER_OS_QNX TRUE BOOL INTERNAL)
+ENDIF (QNXNTO)
+
+IF (PLAYER_OS_LINUX)
+    MESSAGE (STATUS "Operating system is Linux")
+ELSEIF (PLAYER_OS_BSD)
+    MESSAGE (STATUS "Operating system is BSD")
+ELSEIF (PLAYER_OS_WIN)
+    MESSAGE (STATUS "Operating system is Windows")
+ELSEIF (PLAYER_OS_OSX)
+    MESSAGE (STATUS "Operating system is Apple MacOS X")
+ELSEIF (PLAYER_OS_MACOS)
+    MESSAGE (STATUS "Operating system is Apple MacOS (not OS X)")
+ELSEIF (PLAYER_OS_QNX)
+    MESSAGE (STATUS "Operating system is QNX")
+ELSEIF (PLAYER_OS_SOLARIS)
+    MESSAGE (STATUS "Operating system is Solaris")
+ELSE (PLAYER_OS_LINUX)
+    MESSAGE (STATUS "Operating system is generic Unix")
+ENDIF (PLAYER_OS_LINUX)

Added: code/gazebo/trunk/cmake/FindOde.cmake
===================================================================
--- code/gazebo/trunk/cmake/FindOde.cmake                               (rev 0)
+++ code/gazebo/trunk/cmake/FindOde.cmake       2009-06-25 09:49:33 UTC (rev 
7898)
@@ -0,0 +1,54 @@
+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}}")
+
+      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)
+  MESSAGE (SEND_ERROR "\nError: ODE and development files not found. See the 
following website: http://www.ode.org";)
+ELSE (NOT ODE_FOUND)
+  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_link_libs 
+                        ${gazeboserver_link_libs_desc} 
+                        ${ODE_LDFLAGS})
+ENDIF (NOT ODE_FOUND)

Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake        2009-06-25 01:17:47 UTC 
(rev 7897)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake        2009-06-25 09:49:33 UTC 
(rev 7898)
@@ -1,15 +1,15 @@
 INCLUDE (${gazebo_cmake_dir}/GazeboUtils.cmake)
 
+INCLUDE (${gazebo_cmake_dir}/FindOS.cmake)
+SET(FLTK_SKIP_FLUID TRUE)
 INCLUDE (FindFLTK)
 INCLUDE (FindPkgConfig)
+INCLUDE (${gazebo_cmake_dir}/FindOde.cmake)
+INCLUDE (${gazebo_cmake_dir}/FindFreeimage.cmake)
 
 SET (INCLUDE_WEBGAZEBO ON CACHE BOOL "Build webgazebo" FORCE)
 SET (OGRE_LIBRARY_PATH "/usr/local/lib" CACHE INTERNAL "Ogre library path")
 
-SET (freeimage_include_dir "/usr/include/" CACHE STRING "FreeImage include 
paths")
-SET (freeimage_library_dir "/usr/lib" CACHE STRING "FreeImage library paths")
-SET (freeimage_library "freeimage" CACHE STRING "FreeImage library")
-
 SET (boost_include_dirs "" CACHE STRING "Boost include paths. Use this to 
override automatic detection.")
 SET (boost_library_dirs "" CACHE STRING "Boost library paths. Use this to 
override automatic detection.")
 SET (boost_libraries "" CACHE STRING "Boost libraries. Use this to override 
automatic detection.")
@@ -41,78 +41,6 @@
                           ${OGRE_LDFLAGS})
   ENDIF (NOT OGRE_FOUND)
 
-  pkg_check_modules(ODE ode>=${ODE_VERSION})
-  IF (NOT ODE_FOUND)
-    MESSAGE (SEND_ERROR "\nError: ODE and development files not found. See the 
following website: http://www.ode.org";)
-  ELSE (NOT ODE_FOUND)
-    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_link_libs 
-                          ${gazeboserver_link_libs_desc} 
-                          ${ODE_LDFLAGS})
-  ENDIF (NOT ODE_FOUND)
-
-  pkg_check_modules(FI freeimage>=${FREEIMAGE_VERSION})
-  IF (NOT FI_FOUND)
-    MESSAGE (STATUS "freeimage.pc not found, trying freeimage_include_dir and 
freeimage_library_dir flags.")
-
-    FIND_PATH(freeimage_include_dir FreeImage.h ${freeimage_include_dir})
-    IF (NOT freeimage_include_dir)
-      MESSAGE (STATUS "Looking for FreeImage.h - not found")
-      MESSAGE (FATAL_ERROR "Unable to find FreeImage.h")
-    ELSE (NOT freeimage_include_dir)
-
-      # Check the FreeImage header for the right version
-      SET (testFreeImageSource 
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/test_freeimage.cc)
-      FILE (WRITE ${testFreeImageSource}
-            "#include <FreeImage.h>\nint main () { if (FREEIMAGE_MAJOR_VERSION 
>= ${FREEIMAGE_MAJOR_VERSION} && FREEIMAGE_MINOR_VERSION >= 
${FREEIMAGE_MINOR_VERSION}) return 1; else return 0;} \n")
-      TRY_RUN(FREEIMAGE_RUNS FREEIMAGE_COMPILES ${CMAKE_CURRENT_BINARY_DIR} 
-                ${testFreeImageSource})
-      IF (NOT FREEIMAGE_RUNS)
-        MESSAGE (FATAL_ERROR "Invalid FreeImage Version. Requires 
-                  ${FREEIMAGE_VERSION}")
-      ELSE (NOT FREEIMAGE_RUNS)
-        MESSAGE (STATUS "Looking for FreeImage.h - found")
-      ENDIF (NOT FREEIMAGE_RUNS)
-
-    ENDIF (NOT freeimage_include_dir)
-
-    FIND_LIBRARY(freeimage_library freeimage ${freeimage_library_dir})
-    IF (NOT freeimage_library)
-      MESSAGE (STATUS "Looking for libfreeimage - not found")
-      MESSAGE (FATAL_ERROR "Unable to find libfreeimage")
-    ELSE (NOT freeimage_library)
-      MESSAGE (STATUS "Looking for libfreeimage - found")
-    ENDIF (NOT freeimage_library)
-
-  ELSE (NOT FI_FOUND)
-    APPEND_TO_CACHED_LIST(gazeboserver_include_dirs 
-                          ${gazeboserver_include_dirs_desc} 
-                          ${FI_INCLUDE_DIRS})
-    APPEND_TO_CACHED_LIST(gazeboserver_link_dirs 
-                          ${gazeboserver_link_dirs_desc} 
-                          ${FI_LIBRARY_DIRS})
-    APPEND_TO_CACHED_LIST(gazeboserver_link_libs 
-                          ${gazeboserver_link_libs_desc} 
-                          ${FI_LINK_LIBS})
-    APPEND_TO_CACHED_LIST(gazeboserver_link_libs 
-                          ${gazeboserver_link_libs_desc} 
-                          ${FI_LIBRARIES})
-    APPEND_TO_CACHED_LIST(gazeboserver_link_libs 
-                          ${gazeboserver_link_libs_desc} 
-                          ${FI_LDFLAGS})
-  ENDIF (NOT FI_FOUND)
-
   pkg_check_modules(XML libxml-2.0)
   IF (NOT XML_FOUND)
     MESSAGE (SEND_ERROR "\nError: libxml2 and development files not found. See 
the following website: http://www.xmlsoft.org";)
@@ -208,7 +136,7 @@
     SET (HAVE_FFMPEG TRUE)
   ENDIF (AVF_FOUND AND AVC_FOUND)
 
-  pkg_check_modules(PLAYER playerc++)
+  pkg_check_modules(PLAYER playerc++>=2.1)
   IF (NOT PLAYER_FOUND)
     SET (INCLUDE_PLAYER OFF CACHE BOOL "Build gazebo plugin for player" FORCE)
     MESSAGE (STATUS "Warning: Player not found. The gazebo plugin for player 
will not be built. See the following website: 
http://playerstage.sourceforge.net";)

Modified: code/gazebo/trunk/libgazebo/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/libgazebo/CMakeLists.txt  2009-06-25 01:17:47 UTC (rev 
7897)
+++ code/gazebo/trunk/libgazebo/CMakeLists.txt  2009-06-25 09:49:33 UTC (rev 
7898)
@@ -15,7 +15,7 @@
 LINK_DIRECTORIES(${boost_library_dirs})
 
 ADD_LIBRARY(gazeboshm SHARED ${sources})
-SET_TARGET_PROPERTIES(gazeboshm PROPERTIES OUTPUT_NAME "gazebo")
+SET_TARGET_PROPERTIES(gazeboshm PROPERTIES OUTPUT_NAME "gazebo" VERSION 
${GAZEBO_VERSION})
 
 TARGET_LINK_LIBRARIES( gazeboshm ${boost_libraries})
 

Modified: code/gazebo/trunk/libgazebo/SimIface.cc
===================================================================
--- code/gazebo/trunk/libgazebo/SimIface.cc     2009-06-25 01:17:47 UTC (rev 
7897)
+++ code/gazebo/trunk/libgazebo/SimIface.cc     2009-06-25 09:49:33 UTC (rev 
7898)
@@ -6,6 +6,7 @@
 #include <sys/sem.h>
 #include <signal.h>
 
+#include <stdio.h>
 
 #include "gazebo.h"
 

Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt     2009-06-25 01:17:47 UTC (rev 
7897)
+++ code/gazebo/trunk/server/CMakeLists.txt     2009-06-25 09:49:33 UTC (rev 
7898)
@@ -95,6 +95,7 @@
 APPEND_TO_SERVER_SOURCES(${sources})
 
 ADD_LIBRARY(gazebo_server SHARED ${gazeboserver_sources})
+SET_TARGET_PROPERTIES(gazebo_server PROPERTIES VERSION ${GAZEBO_VERSION})
 
 ADD_EXECUTABLE(gazebo-exec main.cc)
 SET_TARGET_PROPERTIES(gazebo-exec PROPERTIES OUTPUT_NAME "gazebo")

Modified: code/gazebo/trunk/server/audio_video/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/audio_video/CMakeLists.txt 2009-06-25 01:17:47 UTC 
(rev 7897)
+++ code/gazebo/trunk/server/audio_video/CMakeLists.txt 2009-06-25 09:49:33 UTC 
(rev 7898)
@@ -21,6 +21,6 @@
 TARGET_LINK_LIBRARIES(gazebo_av-shared ${OAL_LIBRARIES})
 
 #SET_TARGET_PROPERTIES(gazebo_av PROPERTIES OUTPUT_NAME "gazebo_av")
-SET_TARGET_PROPERTIES(gazebo_av-shared PROPERTIES OUTPUT_NAME "gazebo_av")
+SET_TARGET_PROPERTIES(gazebo_av-shared PROPERTIES OUTPUT_NAME "gazebo_av" 
VERSION ${GAZEBO_VERSION})
 
 INSTALL (TARGETS gazebo_av-shared DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)

Modified: code/gazebo/trunk/server/gui/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/gui/CMakeLists.txt 2009-06-25 01:17:47 UTC (rev 
7897)
+++ code/gazebo/trunk/server/gui/CMakeLists.txt 2009-06-25 09:49:33 UTC (rev 
7898)
@@ -23,6 +23,6 @@
 TARGET_LINK_LIBRARIES(gazebo_gui-shared ${FLTK_LIBRARIES} )
 
 #SET_TARGET_PROPERTIES(gazebo_gui PROPERTIES OUTPUT_NAME "gazebo_gui")
-SET_TARGET_PROPERTIES(gazebo_gui-shared PROPERTIES OUTPUT_NAME "gazebo_gui")
+SET_TARGET_PROPERTIES(gazebo_gui-shared PROPERTIES OUTPUT_NAME "gazebo_gui" 
VERSION ${GAZEBO_VERSION})
 
 INSTALL (TARGETS gazebo_gui-shared DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)

Modified: code/gazebo/trunk/server/sensors/contact/ContactSensor.hh
===================================================================
--- code/gazebo/trunk/server/sensors/contact/ContactSensor.hh   2009-06-25 
01:17:47 UTC (rev 7897)
+++ code/gazebo/trunk/server/sensors/contact/ContactSensor.hh   2009-06-25 
09:49:33 UTC (rev 7898)
@@ -29,6 +29,8 @@
 
 #include <vector>
 
+#include <stdint.h>
+
 #include "Angle.hh"
 #include "Sensor.hh"
 #include "Body.hh"


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

Reply via email to