Revision: 7636
http://playerstage.svn.sourceforge.net/playerstage/?rev=7636&view=rev
Author: natepak
Date: 2009-05-11 15:05:56 +0000 (Mon, 11 May 2009)
Log Message:
-----------
More fixes to cmake
Modified Paths:
--------------
code/gazebo/trunk/CMakeLists.txt
code/gazebo/trunk/cmake/SearchForStuff.cmake
code/gazebo/trunk/server/physics/MapGeom.cc
Modified: code/gazebo/trunk/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/CMakeLists.txt 2009-05-11 04:52:57 UTC (rev 7635)
+++ code/gazebo/trunk/CMakeLists.txt 2009-05-11 15:05:56 UTC (rev 7636)
@@ -10,9 +10,8 @@
SET (GAZEBO_VERSION 0.9.0)
MESSAGE (STATUS "${PROJECT_NAME} version ${GAZEBO_VERSION}")
+SET (BUILD_GAZEBO ON CACHE INTERNAL "Build Gazebo" FORCE)
-SET (BUILD_GAZEBO OFF CACHE INTERNAL "Build Gazebo" FORCE)
-
SET (gazeboserver_sources_desc "List of server sources"
CACHE INTERNAL "Gazebo server sources list description" FORCE)
SET (gazeboserver_include_dirs_desc "List of server include directories"
@@ -24,8 +23,9 @@
SET (gazeboserver_cflags_desc "List of server cflags"
CACHE INTERNAL "Server cflags description" FORCE)
-SET (OGRE_VERSION 1.6.0 CACHE INTERNAL "Ogre Version Requirement")
-SET (ODE_VERSION 0.10.1 CACHE INTERNAL "ODE Version Requirement")
+SET (OGRE_VERSION 1.6.1 CACHE INTERNAL "Ogre version requirement" FORCE)
+SET (ODE_VERSION 0.10.1 CACHE INTERNAL "ODE version requirement" FORCE)
+SET (MIN_BOOST_VERSION 1.35.0 CACHE INTERNAL "Boost min version requirement"
FORCE)
SET (gazebo_cmake_dir ${PROJECT_SOURCE_DIR}/cmake CACHE PATH
"Location of CMake scripts")
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-05-11 04:52:57 UTC
(rev 7635)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-05-11 15:05:56 UTC
(rev 7636)
@@ -179,24 +179,20 @@
########################################
# Find Boost, if not specified manually
IF (NOT boost_include_dirs AND NOT boost_library_dirs AND NOT boost_libraries )
- SET(Boost_ADDITIONAL_VERSIONS "1.37.0")
# Clear some variables to ensure that the checks for boost are
# always run
SET (Boost_THREAD_FOUND OFF CACHE INTERNAL "" FORCE)
SET (Boost_SIGNALS_FOUND OFF CACHE INTERNAL "" FORCE)
- SET (Boost_INCLUDE_DIR "" CACHE INTERNAL "" FORCE)
+ SET(Boost_ADDITIONAL_VERSIONS "1.35" "1.35.0" "1.36" "1.36.1" "1.37.0" CACHE
INTERNAL "Boost Additional versions" FORCE)
INCLUDE (FindBoost)
- FIND_PACKAGE( Boost 1.37.0 COMPONENTS thread signals)
+ FIND_PACKAGE( Boost ${MIN_BOOST_VERSION} REQUIRED thread signals )
IF (NOT Boost_FOUND)
SET (BUILD_GAZEBO OFF CACHE INTERNAL "Build Gazebo" FORCE)
- MESSAGE (FATAL_ERROR "Boost thread and signals not found. Please install
Boost threads and signals version 1.37.0 or higher.")
-
- ELSE (NOT Boost_FOUND)
- MESSAGE (STATUS "Found Boost!")
+ MESSAGE (FATAL_ERROR "Boost thread and signals not found. Please install
Boost threads and signals version ${MIN_BOOST_VERSION} or higher.")
ENDIF (NOT Boost_FOUND)
SET (boost_include_dirs ${Boost_INCLUDE_DIRS} CACHE STRING
Modified: code/gazebo/trunk/server/physics/MapGeom.cc
===================================================================
--- code/gazebo/trunk/server/physics/MapGeom.cc 2009-05-11 04:52:57 UTC (rev
7635)
+++ code/gazebo/trunk/server/physics/MapGeom.cc 2009-05-11 15:05:56 UTC (rev
7636)
@@ -144,7 +144,8 @@
this->CreateBoxes(this->root);
- this->visualNode->MakeStatic();
+ if (this->visualNode)
+ this->visualNode->MakeStatic();
}
@@ -371,7 +372,8 @@
newY += ceil(newH);
}
- node->occupied = true;
+ //node->occupied = true;
+ node->occupied = false;
node->leaf = false;
}
else if (occPixels == 0)
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
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
