Revision: 8402
http://playerstage.svn.sourceforge.net/playerstage/?rev=8402&view=rev
Author: natepak
Date: 2009-11-13 22:38:34 +0000 (Fri, 13 Nov 2009)
Log Message:
-----------
Modified build to generate libraries for rendering and physics
Modified Paths:
--------------
code/gazebo/trunk/cmake/SearchForStuff.cmake
code/gazebo/trunk/server/CMakeLists.txt
code/gazebo/trunk/server/STLLoader.cc
code/gazebo/trunk/server/physics/CMakeLists.txt
code/gazebo/trunk/server/physics/ode/CMakeLists.txt
code/gazebo/trunk/server/rendering/CMakeLists.txt
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-11-13 18:29:24 UTC
(rev 8401)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-11-13 22:38:34 UTC
(rev 8402)
@@ -25,6 +25,7 @@
ELSE (NOT OGRE_FOUND)
SET (OGRE_LIBRARY_PATH ${OGRE_LIBRARY_DIRS} CACHE INTERNAL "Ogre library
path")
+
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
${gazeboserver_include_dirs_desc}
${OGRE_INCLUDE_DIRS})
Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt 2009-11-13 18:29:24 UTC (rev
8401)
+++ code/gazebo/trunk/server/CMakeLists.txt 2009-11-13 22:38:34 UTC (rev
8402)
@@ -134,27 +134,29 @@
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
ENDIF (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
-TARGET_LINK_LIBRARIES( gazebo-exec ${libtool_library}
+target_link_libraries( gazebo-exec ${libtool_library}
${gazeboserver_link_libs}
${boost_libraries}
gazebo_server
${freeimage_library}
+ gazebo_rendering
gazebo_av-shared
gazebo_gui-shared
+ gazebo_physics
gazebo
)
if (INCLUDE_BULLET)
- TARGET_LINK_LIBRARIES(gazebo-exec gazebo_physics_bullet ${bullet_link_libs})
- TARGET_LINK_LIBRARIES(gazebo_server gazebo_physics_bullet
${bullet_link_libs})
+ target_link_libraries(gazebo-exec gazebo_physics_bullet ${bullet_link_libs})
+ target_link_libraries(gazebo_server gazebo_physics_bullet
${bullet_link_libs})
endif (INCLUDE_BULLET)
if (INCLUDE_ODE)
- TARGET_LINK_LIBRARIES(gazebo-exec gazebo_physics_ode ${ODE_LIBRARIES})
- TARGET_LINK_LIBRARIES(gazebo_server gazebo_physics_ode ${ODE_LIBRARIES})
+ target_link_libraries(gazebo-exec gazebo_physics_ode ${ODE_LIBRARIES})
+ target_link_libraries(gazebo_server gazebo_physics_ode ${ODE_LIBRARIES})
endif (INCLUDE_ODE)
-TARGET_LINK_LIBRARIES( gazebo_server ${libtool_library} ${freeimage_library}
gazebo)
+TARGET_LINK_LIBRARIES( gazebo_server ${libtool_library} ${freeimage_library}
gazebo gazebo_rendering gazebo_physics )
INSTALL (TARGETS gazebo-exec DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
INSTALL (TARGETS gazebo_server DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
Modified: code/gazebo/trunk/server/STLLoader.cc
===================================================================
--- code/gazebo/trunk/server/STLLoader.cc 2009-11-13 18:29:24 UTC (rev
8401)
+++ code/gazebo/trunk/server/STLLoader.cc 2009-11-13 22:38:34 UTC (rev
8402)
@@ -92,14 +92,16 @@
normal.y = r2;
normal.z = r3;
- fgets ( input, LINE_MAX_LEN, filein );
+ if (fgets ( input, LINE_MAX_LEN, filein ) == NULL)
+ std::cerr << "Error..\n";
ivert = 0;
for ( ;; )
{
Vector3 vertex;
- fgets ( input, LINE_MAX_LEN, filein );
+ if (fgets ( input, LINE_MAX_LEN, filein ) == NULL)
+ std::cerr << "Error...\n";
count = sscanf ( input, "%*s %e %e %e", &r1, &r2, &r3 );
@@ -120,7 +122,8 @@
ivert = ivert + 1;
}
- fgets ( input, LINE_MAX_LEN, filein );
+ if (fgets ( input, LINE_MAX_LEN, filein ) == NULL)
+ printf("Error...\n");
}
// COLOR
else if ( this->Leqi ( token, (char*)"color" ))
@@ -268,7 +271,9 @@
float STLLoader::FloatRead ( FILE *filein )
{
float rval;
- fread ( &rval, sizeof ( float ), 1, filein );
+ if (fread ( &rval, sizeof ( float ), 1, filein ) == 0)
+ printf("Error...\n");
+
return rval;
}
Modified: code/gazebo/trunk/server/physics/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/physics/CMakeLists.txt 2009-11-13 18:29:24 UTC
(rev 8401)
+++ code/gazebo/trunk/server/physics/CMakeLists.txt 2009-11-13 22:38:34 UTC
(rev 8402)
@@ -50,6 +50,7 @@
HeightmapShape.hh
)
-#add_library(gazebo_physics STATIC ${sources})
-APPEND_TO_SERVER_SOURCES(${sources})
-APPEND_TO_SERVER_HEADERS(${headers})
+add_library(gazebo_physics SHARED ${sources})
+install ( TARGETS gazebo_physics DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
+#APPEND_TO_SERVER_SOURCES(${sources})
+#APPEND_TO_SERVER_HEADERS(${headers})
Modified: code/gazebo/trunk/server/physics/ode/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/physics/ode/CMakeLists.txt 2009-11-13 18:29:24 UTC
(rev 8401)
+++ code/gazebo/trunk/server/physics/ode/CMakeLists.txt 2009-11-13 22:38:34 UTC
(rev 8402)
@@ -15,6 +15,6 @@
ODEHeightmapShape.cc
)
-ADD_LIBRARY(gazebo_physics_ode SHARED ${sources})
-TARGET_LINK_LIBRARIES( gazebo_physics_ode ${ODE_LIBRARIES})
-INSTALL ( TARGETS gazebo_physics_ode DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
+add_library(gazebo_physics_ode SHARED ${sources})
+target_link_libraries( gazebo_physics_ode ${ODE_LIBRARIES})
+install ( TARGETS gazebo_physics_ode DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
Modified: code/gazebo/trunk/server/rendering/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/rendering/CMakeLists.txt 2009-11-13 18:29:24 UTC
(rev 8401)
+++ code/gazebo/trunk/server/rendering/CMakeLists.txt 2009-11-13 22:38:34 UTC
(rev 8402)
@@ -1,6 +1,13 @@
include (${gazebo_cmake_dir}/GazeboUtils.cmake)
-SET (sources OgreMovableText.cc
+message(STATUS "OGRE INCLUDE DIRS ${OGRE_INCLUDE_DIRS}")
+
+include_directories (
+ .
+ ${OGRE_INCLUDE_DIRS}
+)
+
+set (sources OgreMovableText.cc
OgreCreator.cc
OgreAdaptor.cc
OgreFrameListener.cc
@@ -17,7 +24,7 @@
Material.cc
)
-SET (headers OgreMovableText.hh
+set (headers OgreMovableText.hh
OgreCreator.hh
OgreAdaptor.hh
OgreFrameListener.hh
@@ -34,6 +41,6 @@
Material.hh
)
-#ADD_LIBRARY(gazebo_rendering ${sources})
-APPEND_TO_SERVER_SOURCES(${sources})
-APPEND_TO_SERVER_HEADERS(${headers})
+add_library(gazebo_rendering SHARED ${sources})
+target_link_libraries( gazebo_rendering ${OGRE_LIBRARIES})
+install ( TARGETS gazebo_rendering DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
