Revision: 7632
http://playerstage.svn.sourceforge.net/playerstage/?rev=7632&view=rev
Author: natepak
Date: 2009-05-09 16:04:05 +0000 (Sat, 09 May 2009)
Log Message:
-----------
Fixed warning messages
Modified Paths:
--------------
code/gazebo/trunk/CMakeLists.txt
code/gazebo/trunk/cmake/GazeboUtils.cmake
code/gazebo/trunk/cmake/SearchForStuff.cmake
code/gazebo/trunk/libgazebo/CMakeLists.txt
code/gazebo/trunk/server/CMakeLists.txt
code/gazebo/trunk/server/Simulator.cc
code/gazebo/trunk/server/gui/GLFrameManager.cc
code/gazebo/trunk/server/rendering/OgreCamera.cc
code/gazebo/trunk/server/rendering/OgreMovableText.cc
code/gazebo/trunk/server/rendering/OgreVisual.cc
code/gazebo/trunk/webgazebo/CMakeLists.txt
Modified: code/gazebo/trunk/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/CMakeLists.txt 2009-05-09 15:16:57 UTC (rev 7631)
+++ code/gazebo/trunk/CMakeLists.txt 2009-05-09 16:04:05 UTC (rev 7632)
@@ -28,11 +28,9 @@
"Location of CMake scripts")
SET (boost_include_dirs "" CACHE STRING "Boost include paths. Use this to
override automatic detection.")
-SET (boost_link_flags "" CACHE STRING "Boost link flags. 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.")
+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.")
-
#####################################
# Build type cflags
SET (CMAKE_C_FLAGS_RELEASE " -O3 -DNDEBUG -fPIC -Wall " CACHE INTERNAL "C
Flags for release" FORCE)
Modified: code/gazebo/trunk/cmake/GazeboUtils.cmake
===================================================================
--- code/gazebo/trunk/cmake/GazeboUtils.cmake 2009-05-09 15:16:57 UTC (rev
7631)
+++ code/gazebo/trunk/cmake/GazeboUtils.cmake 2009-05-09 16:04:05 UTC (rev
7632)
@@ -4,8 +4,9 @@
# Appends items to a cached list.
MACRO (APPEND_TO_CACHED_STRING _string _cacheDesc)
FOREACH (newItem ${ARGN})
- SET (${_string} "${${_string}} ${newItem}" CACHE INTERNAL ${_cacheDesc}
FORCE)
+ SET (${_string} "${${_string}} ${newItem}" CACHE STRING ${_cacheDesc}
FORCE)
ENDFOREACH (newItem ${ARGN})
+ STRING(STRIP ${${_string}} ${_string})
ENDMACRO (APPEND_TO_CACHED_STRING)
################################################################################
@@ -34,8 +35,9 @@
MACRO (LIST_TO_STRING _string _list)
SET (${_string})
FOREACH (_item ${_list})
- SET (${_string} "${${_string}} ${_item}")
+ SET (${_string} "${${_string}} ${_item}")
ENDFOREACH (_item)
+ STRING(STRIP ${${_string}} ${_string})
ENDMACRO (LIST_TO_STRING)
###############################################################################
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-05-09 15:16:57 UTC
(rev 7631)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-05-09 16:04:05 UTC
(rev 7632)
@@ -180,31 +180,35 @@
# Find Boost, if not specified manually
IF (NOT boost_include_dirs AND NOT boost_library_dirs AND NOT boost_libraries )
INCLUDE (FindBoost)
- FIND_PACKAGE( Boost 1.34.1 COMPONENTS thread signals)
+ SET(Boost_ADDITIONAL_VERSIONS "1.37.0")
+ FIND_PACKAGE( Boost 1.37.0 COMPONENTS thread signals)
IF (NOT Boost_FOUND)
MESSAGE (FATAL_ERROR "Boost thread and signals not found")
SET (BUILD_GAZEBO OFF CACHE BOOL "Build Gazebo" FORCE)
ENDIF (NOT Boost_FOUND)
- LIST_TO_STRING(tmp "${Boost_INCLUDE_DIRS}")
SET (boost_include_dirs ${Boost_INCLUDE_DIRS} CACHE STRING
"Boost include paths. Use this to override automatic detection." FORCE)
- FOREACH (dir ${Boost_LIBRARY_DIRS})
- APPEND_TO_CACHED_STRING(boost_link_flags
- "Boost link flags. Use this to override automatic detection." "-L${dir}"
)
- ENDFOREACH (dir Boost_LIBRARY_DIRS)
+ SET (boost_library_dirs ${Boost_LIBRARY_DIRS} CACHE STRING
+ "Boost link dirs. Use this to override automatic detection." FORCE)
- FOREACH (lib ${Boost_LIBRARIES})
- APPEND_TO_CACHED_STRING (boost_link_flags
- "Boost link flags. Use this to override automatic detection." "-l${lib}"
)
- ENDFOREACH (lib Boost_LIBRARIES)
+ LIST_TO_STRING(tmp "${Boost_LIBRARIES}")
+ SET (boost_libraries ${tmp} CACHE STRING
+ "Boost libraries. Use this to override automatic detection." FORCE )
-ENDIF (NOT boost_include_dirs AND NOT boost_library_dirs AND NOT
boost_libraries )
+ENDIF (NOT boost_include_dirs AND NOT boost_library_dirs AND NOT
boost_libraries )
-MESSAGE (STATUS "Boost IDIRS ${boost_include_dirs}")
-MESSAGE (STATUS "Boost LFLAGS ${boost_link_flags}")
+STRING(REGEX REPLACE "(^| )-L" " " boost_library_dirs "${boost_library_dirs}")
+STRING(REGEX REPLACE "(^| )-l" " " boost_libraries "${boost_libraries}")
+STRING(STRIP ${boost_library_dirs} boost_library_dirs)
+STRING(STRIP ${boost_libraries} boost_libraries)
+STRING(REGEX REPLACE " " ";" boost_libraries "${boost_libraries}")
+MESSAGE (STATUS "Boost Include Path: ${boost_include_dirs}")
+MESSAGE (STATUS "Boost Library Path: ${boost_library_dirs}")
+MESSAGE (STATUS "Boost Libraries: ${boost_libraries}")
+
########################################
# Find avformat and avcodec
IF (INCLUDE_AV)
Modified: code/gazebo/trunk/libgazebo/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/libgazebo/CMakeLists.txt 2009-05-09 15:16:57 UTC (rev
7631)
+++ code/gazebo/trunk/libgazebo/CMakeLists.txt 2009-05-09 16:04:05 UTC (rev
7632)
@@ -1,29 +1,3 @@
-########################################
-# Find Boost, if not specified manually
-IF (NOT boost_include_dirs AND NOT boost_library_dirs AND NOT boost_libraries )
- MESSAGE(STATUS "HERE")
- INCLUDE (FindBoost)
- FIND_PACKAGE( Boost 1.34.1 COMPONENTS thread signals)
- IF (NOT Boost_FOUND)
- MESSAGE (FATAL_ERROR "Boost thread and signals not found")
- SET (BUILD_GAZEBO OFF CACHE BOOL "Build Gazebo" FORCE)
- ENDIF (NOT Boost_FOUND)
-
-
- LIST_TO_STRING(tmp "${Boost_INCLUDE_DIRS}")
- SET (boost_include_dirs ${Boost_INCLUDE_DIRS} CACHE STRING
- "Boost include paths. Use this to override automatic detection." FORCE)
-
- LIST_TO_STRING(tmp "${Boost_LIBRARY_DIRS}")
- SET (boost_library_dirs ${Boost_LIBRARY_DIRS} CACHE STRING
- "Boost library paths. Use this to override automatic detection." FORCE)
-
- LIST_TO_STRING(tmp "${Boost_LIBRARIES}")
- SET (boost_libraries ${Boost_LIBRARIES} CACHE STRING
- "Boost libraries. Use this to override automatic detection." FORCE)
-ENDIF (NOT boost_include_dirs AND NOT boost_library_dirs AND NOT
boost_libraries )
-
-
SET (sources Server.cc
Client.cc
Iface.cc
@@ -34,7 +8,10 @@
SET (headers gazebo.h IfaceFactory.hh)
+LINK_DIRECTORIES(${boost_library_dirs})
+
ADD_LIBRARY(gazeboshm SHARED ${sources})
+
TARGET_LINK_LIBRARIES( gazeboshm ${boost_libraries})
INSTALL (TARGETS gazeboshm DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt 2009-05-09 15:16:57 UTC (rev
7631)
+++ code/gazebo/trunk/server/CMakeLists.txt 2009-05-09 16:04:05 UTC (rev
7632)
@@ -26,9 +26,7 @@
########################################
# All the library search paths
LINK_DIRECTORIES(
- ${CMAKE_SOURCE_DIR}/libgazebo
- ${boost_library_dirs}
- ${gazeboserver_link_dirs}
+ ${CMAKE_SOURCE_DIR}/libgazebo ${boost_library_dirs} ${gazeboserver_link_dirs}
)
########################################
@@ -85,23 +83,19 @@
APPEND_TO_SERVER_SOURCES(${sources})
-
ADD_EXECUTABLE(gazebo ${gazeboserver_sources} main.cc)
LIST_TO_STRING(GAZEBO_CFLAGS "${gazeboserver_cflags}")
SET_SOURCE_FILES_PROPERTIES(${gazeboserver_sources} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
-# Construct the aggregate link flags
-APPEND_TO_CACHED_STRING(GAZEBO_LFLAGS "gazebo link flags"
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
-APPEND_TO_CACHED_STRING(GAZEBO_LFLAGS "gazebo link flags" ${boost_link_flags})
-MESSAGE (STATUS "GAZEBO LINK FLAGS|${GAZEBO_LFLAGS}|")
+IF (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ SET_SOURCE_FILES_PROPERTIES(${gazeboserver_sources} PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+ENDIF (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
-SET_SOURCE_FILES_PROPERTIES(${gazeboserver_sources} PROPERTIES LINK_FLAGS
- ${GAZEBO_LFLAGS})
+TARGET_LINK_LIBRARIES( gazebo ${gazeboserver_link_libs} ${FLTK_LIBRARIES}
${boost_libraries} gazeboshm )
-TARGET_LINK_LIBRARIES( gazebo gazeboshm ${gazeboserver_link_libs}
${FLTK_LIBRARIES} ${boost_libraries})
-
INSTALL (TARGETS gazebo DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
INSTALL (FILES ${headers} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/gazebo
COMPONENT headers)
Modified: code/gazebo/trunk/server/Simulator.cc
===================================================================
--- code/gazebo/trunk/server/Simulator.cc 2009-05-09 15:16:57 UTC (rev
7631)
+++ code/gazebo/trunk/server/Simulator.cc 2009-05-09 16:04:05 UTC (rev
7632)
@@ -317,7 +317,8 @@
/// Main simulation loop, when this loop ends the simulation finish
void Simulator::MainLoop()
{
- double currTime, lastTime;
+ double currTime = 0;
+ double lastTime = 0;
double freq = 30.0;
this->physicsThread = new boost::thread(
boost::bind(&Simulator::PhysicsLoop, this));
Modified: code/gazebo/trunk/server/gui/GLFrameManager.cc
===================================================================
--- code/gazebo/trunk/server/gui/GLFrameManager.cc 2009-05-09 15:16:57 UTC
(rev 7631)
+++ code/gazebo/trunk/server/gui/GLFrameManager.cc 2009-05-09 16:04:05 UTC
(rev 7632)
@@ -197,7 +197,10 @@
GLFrame *glFrame = NULL;
unsigned int origWidth = parent->w();
unsigned int origHeight = parent->h();
- unsigned int newWidth, newHeight, originX, originY;
+ unsigned int newWidth = 0;
+ unsigned int newHeight = 0;
+ unsigned int originX = 0;
+ unsigned int originY = 0;
int windowCount = this->children();
if (type == "horz")
Modified: code/gazebo/trunk/server/rendering/OgreCamera.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreCamera.cc 2009-05-09 15:16:57 UTC
(rev 7631)
+++ code/gazebo/trunk/server/rendering/OgreCamera.cc 2009-05-09 16:04:05 UTC
(rev 7632)
@@ -128,7 +128,8 @@
{
std::string command;
command = "mkdir " + this->savePathnameP->GetValue() + " 2>>/dev/null";
- system(command.c_str());
+ if (system(command.c_str()) < 0)
+ std::cerr << "Error making directory\n";
}
if (this->hfovP->GetValue() < Angle(0.01) ||
@@ -392,7 +393,8 @@
{
std::string command;
command = "mkdir " + this->savePathnameP->GetValue() + " 2>>/dev/null";
- system(command.c_str());
+ if (system(command.c_str()) <0)
+ std::cerr << "Error making directory\n";
}
}
@@ -523,7 +525,8 @@
{
std::string command;
command = "mkdir " + this->savePathnameP->GetValue() + " 2>>/dev/null";
- system(command.c_str());
+ if (system(command.c_str()) < 0)
+ std::cerr << "Error making directory\n";
}
// Get access to the buffer and make an image and write it to file
Modified: code/gazebo/trunk/server/rendering/OgreMovableText.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreMovableText.cc 2009-05-09
15:16:57 UTC (rev 7631)
+++ code/gazebo/trunk/server/rendering/OgreMovableText.cc 2009-05-09
16:04:05 UTC (rev 7632)
@@ -281,7 +281,9 @@
float len = 0.0f;
// for calculation of AABB
- Ogre::Vector3 min, max, currPos;
+ Ogre::Vector3 min(0,0,0);
+ Ogre::Vector3 max(0,0,0);
+ Ogre::Vector3 currPos(0,0,0);
unsigned int vertexCount = static_cast<unsigned int>(this->text.size() * 6);
Modified: code/gazebo/trunk/server/rendering/OgreVisual.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreVisual.cc 2009-05-09 15:16:57 UTC
(rev 7631)
+++ code/gazebo/trunk/server/rendering/OgreVisual.cc 2009-05-09 16:04:05 UTC
(rev 7632)
@@ -125,8 +125,8 @@
std::ostringstream stream;
Pose3d pose;
- Vector3 size;
- Ogre::Vector3 meshSize;
+ Vector3 size(0,0,0);
+ Ogre::Vector3 meshSize(0,0,0);
Ogre::MovableObject *obj = NULL;
this->xyzP->Load(node);
Modified: code/gazebo/trunk/webgazebo/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/webgazebo/CMakeLists.txt 2009-05-09 15:16:57 UTC (rev
7631)
+++ code/gazebo/trunk/webgazebo/CMakeLists.txt 2009-05-09 16:04:05 UTC (rev
7632)
@@ -1,8 +1,9 @@
SET (sources WebGazebo.cc ../server/Quatern.cc ../server/Vector3.cc
../server/Angle.cc)
INCLUDE_DIRECTORIES( .. ../server ${WEBSIM_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/libgazebo )
-LINK_DIRECTORIES( ${WEBSIM_LINK_DIRS} gazeboshm)
+LINK_DIRECTORIES( ${WEBSIM_LINK_DIRS} ${boost_library_dirs} gazeboshm)
+
SET_SOURCE_FILES_PROPERTIES(${sources} PROPERTIES COMPILE_FLAGS
'-DINSTALL_PREFIX="/usr/local/"')
ADD_LIBRARY(webgz ${sources})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
