Revision: 7644
http://playerstage.svn.sourceforge.net/playerstage/?rev=7644&view=rev
Author: natepak
Date: 2009-05-13 15:41:40 +0000 (Wed, 13 May 2009)
Log Message:
-----------
More tweaks to the cmake build
Modified Paths:
--------------
code/gazebo/trunk/libgazebo/CMakeLists.txt
code/gazebo/trunk/player/CMakeLists.txt
code/gazebo/trunk/server/audio_video/CMakeLists.txt
code/gazebo/trunk/server/gui/CMakeLists.txt
code/gazebo/trunk/server/physics/CMakeLists.txt
code/gazebo/trunk/server/rendering/CMakeLists.txt
code/gazebo/trunk/server/sensors/CMakeLists.txt
code/gazebo/trunk/webgazebo/CMakeLists.txt
code/gazebo/trunk/webgazebo/WebGazebo.hh
code/gazebo/trunk/webgazebo/main.cc
Modified: code/gazebo/trunk/libgazebo/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/libgazebo/CMakeLists.txt 2009-05-13 13:18:38 UTC (rev
7643)
+++ code/gazebo/trunk/libgazebo/CMakeLists.txt 2009-05-13 15:41:40 UTC (rev
7644)
@@ -8,6 +8,10 @@
SET (headers gazebo.h IfaceFactory.hh)
+INCLUDE_DIRECTORIES(
+ ${boost_include_dirs}
+)
+
LINK_DIRECTORIES(${boost_library_dirs})
ADD_LIBRARY(gazeboshm SHARED ${sources})
Modified: code/gazebo/trunk/player/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/player/CMakeLists.txt 2009-05-13 13:18:38 UTC (rev
7643)
+++ code/gazebo/trunk/player/CMakeLists.txt 2009-05-13 15:41:40 UTC (rev
7644)
@@ -17,7 +17,12 @@
IRInterface.cc
)
-INCLUDE_DIRECTORIES( ${PLAYER_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/libgazebo )
+INCLUDE_DIRECTORIES(
+ ${PLAYER_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/libgazebo
+ ${boost_include_dirs}
+)
+
LINK_DIRECTORIES( ${PLAYER_LINK_DIRS} gazeboshm)
ADD_LIBRARY(gazeboplugin SHARED ${sources})
Modified: code/gazebo/trunk/server/audio_video/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/audio_video/CMakeLists.txt 2009-05-13 13:18:38 UTC
(rev 7643)
+++ code/gazebo/trunk/server/audio_video/CMakeLists.txt 2009-05-13 15:41:40 UTC
(rev 7644)
@@ -3,6 +3,7 @@
${LIBAVCODEC_PATH}
${LIBAVFORMAT_PATH}
${gazeboserver_include_dirs}
+ ${boost_include_dirs}
)
SET (sources AudioDecoder.cc
Modified: code/gazebo/trunk/server/gui/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/gui/CMakeLists.txt 2009-05-13 13:18:38 UTC (rev
7643)
+++ code/gazebo/trunk/server/gui/CMakeLists.txt 2009-05-13 15:41:40 UTC (rev
7644)
@@ -4,6 +4,7 @@
${CMAKE_SOURCE_DIR}/server/rendering
${CMAKE_SOURCE_DIR}/server/physics
${gazeboserver_include_dirs}
+ ${boost_include_dirs}
)
SET (sources Gui.cc
Modified: code/gazebo/trunk/server/physics/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/physics/CMakeLists.txt 2009-05-13 13:18:38 UTC
(rev 7643)
+++ code/gazebo/trunk/server/physics/CMakeLists.txt 2009-05-13 15:41:40 UTC
(rev 7644)
@@ -7,6 +7,7 @@
${CMAKE_SOURCE_DIR}/server/rendering
${CMAKE_SOURCE_DIR}/server/sensors
${gazeboserver_include_dirs}
+ ${boost_include_dirs}
)
SET (sources BallJoint.cc
Modified: code/gazebo/trunk/server/rendering/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/rendering/CMakeLists.txt 2009-05-13 13:18:38 UTC
(rev 7643)
+++ code/gazebo/trunk/server/rendering/CMakeLists.txt 2009-05-13 15:41:40 UTC
(rev 7644)
@@ -4,6 +4,7 @@
${CMAKE_SOURCE_DIR}/server
${CMAKE_SOURCE_DIR}/server/gui
${gazeboserver_include_dirs}
+ ${boost_include_dirs}
)
SET (sources OgreMovableText.cc
Modified: code/gazebo/trunk/server/sensors/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/sensors/CMakeLists.txt 2009-05-13 13:18:38 UTC
(rev 7643)
+++ code/gazebo/trunk/server/sensors/CMakeLists.txt 2009-05-13 15:41:40 UTC
(rev 7644)
@@ -9,6 +9,7 @@
${CMAKE_SOURCE_DIR}/server/physics/ode
${CMAKE_SOURCE_DIR}/server/rendering
${gazeboserver_include_dirs}
+ ${boost_include_dirs}
)
LINK_DIRECTORIES(
Modified: code/gazebo/trunk/webgazebo/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/webgazebo/CMakeLists.txt 2009-05-13 13:18:38 UTC (rev
7643)
+++ code/gazebo/trunk/webgazebo/CMakeLists.txt 2009-05-13 15:41:40 UTC (rev
7644)
@@ -1,8 +1,21 @@
-SET (sources WebGazebo.cc ../server/Quatern.cc ../server/Vector3.cc
../server/Angle.cc)
+SET (sources WebGazebo.cc
+ ../server/Quatern.cc
+ ../server/Vector3.cc
+ ../server/Angle.cc
+)
-INCLUDE_DIRECTORIES( .. ../server ${WEBSIM_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/libgazebo )
+INCLUDE_DIRECTORIES(
+ ${CMAKE_SOURCE_DIR}/server
+ ${CMAKE_SOURCE_DIR}/libgazebo
+ ${WEBSIM_INCLUDE_DIRS}
+ ${boost_include_dirs}
+)
-LINK_DIRECTORIES( ${WEBSIM_LINK_DIRS} ${boost_library_dirs} gazeboshm)
+LINK_DIRECTORIES(
+ ${WEBSIM_LINK_DIRS}
+ ${boost_library_dirs}
+ ${CMAKE_BINARY_DIR}/libgazebo
+)
SET_SOURCE_FILES_PROPERTIES(${sources} PROPERTIES COMPILE_FLAGS
'-DINSTALL_PREFIX="/usr/local/"')
@@ -12,8 +25,8 @@
ADD_EXECUTABLE(client client.cc)
TARGET_LINK_LIBRARIES( webgz yaml event ${WEBSIM_LINK_LIBS})
-TARGET_LINK_LIBRARIES( webgazebo gazeboshm yaml event ${WEBSIM_LINK_LIBS}
${Boost_LIBRARIES} webgz)
-TARGET_LINK_LIBRARIES( client gazeboshm yaml event ${WEBSIM_LINK_LIBS}
${Boost_LIBRARIES} webgz)
+TARGET_LINK_LIBRARIES( webgazebo gazebo yaml event ${WEBSIM_LINK_LIBS}
${boost_libraries} webgz)
+TARGET_LINK_LIBRARIES( client gazebo yaml event ${WEBSIM_LINK_LIBS}
${boost_libraries} webgz)
INSTALL(TARGETS webgazebo DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
INSTALL(TARGETS webgz DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
Modified: code/gazebo/trunk/webgazebo/WebGazebo.hh
===================================================================
--- code/gazebo/trunk/webgazebo/WebGazebo.hh 2009-05-13 13:18:38 UTC (rev
7643)
+++ code/gazebo/trunk/webgazebo/WebGazebo.hh 2009-05-13 15:41:40 UTC (rev
7644)
@@ -32,9 +32,8 @@
#include <sys/types.h>
#include <sys/queue.h>
-// libgazebo; the libgazebo directory is used because we're building
-// against the source tree
-#include <libgazebo/gazebo.h>
+// libgazebo;
+#include "gazebo.h"
#include "websim/websim.hh"
Modified: code/gazebo/trunk/webgazebo/main.cc
===================================================================
--- code/gazebo/trunk/webgazebo/main.cc 2009-05-13 13:18:38 UTC (rev 7643)
+++ code/gazebo/trunk/webgazebo/main.cc 2009-05-13 15:41:40 UTC (rev 7644)
@@ -25,7 +25,7 @@
* SVN: $Id: gazebo.h 7398 2009-03-09 07:21:49Z natepak $
*/
-#include "webgazebo/WebGazebo.hh"
+#include "WebGazebo.hh"
#include <stdlib.h>
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
