Revision: 7653
http://playerstage.svn.sourceforge.net/playerstage/?rev=7653&view=rev
Author: natepak
Date: 2009-05-14 01:29:27 +0000 (Thu, 14 May 2009)
Log Message:
-----------
More updates to the cmakelists files
Modified Paths:
--------------
code/gazebo/trunk/server/CMakeLists.txt
code/gazebo/trunk/server/audio_video/CMakeLists.txt
code/gazebo/trunk/server/controllers/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/server/sensors/camera/CMakeLists.txt
code/gazebo/trunk/server/sensors/contact/CMakeLists.txt
code/gazebo/trunk/server/sensors/imu/CMakeLists.txt
code/gazebo/trunk/server/sensors/ir/CMakeLists.txt
code/gazebo/trunk/server/sensors/ray/CMakeLists.txt
Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt 2009-05-14 00:34:36 UTC (rev
7652)
+++ code/gazebo/trunk/server/CMakeLists.txt 2009-05-14 01:29:27 UTC (rev
7653)
@@ -19,6 +19,8 @@
sensors/imu
sensors/ir
sensors/ray
+ ${LIBAVCODEC_PATH}
+ ${LIBAVFORMAT_PATH}
${gazeboserver_include_dirs}
${boost_include_dirs}
${freeimage_include_dir}
@@ -91,9 +93,9 @@
APPEND_TO_SERVER_HEADERS(${headers})
APPEND_TO_SERVER_SOURCES(${sources})
-#ADD_LIBRARY(gazeboserver STATIC ${gazeboserver_sources})
+ADD_LIBRARY(gazebo_server SHARED ${gazeboserver_sources})
-ADD_EXECUTABLE(gazebo-exec ${gazeboserver_sources} main.cc)
+ADD_EXECUTABLE(gazebo-exec main.cc)
SET_TARGET_PROPERTIES(gazebo-exec PROPERTIES OUTPUT_NAME "gazebo")
LIST_TO_STRING(GAZEBO_CFLAGS "${gazeboserver_cflags}")
@@ -105,19 +107,18 @@
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
ENDIF (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
-TARGET_LINK_LIBRARIES( gazebo-exec gazebo_gui
- gazebo_sensors
- gazebo_physics
- gazebo_rendering
- gazebo_av
- ${gazeboserver_link_libs}
+TARGET_LINK_LIBRARIES( gazebo-exec ${gazeboserver_link_libs}
${FLTK_LIBRARIES}
${boost_libraries}
${freeimage_library}
+ gazebo_server
gazebo
)
+TARGET_LINK_LIBRARIES( gazebo_server ${gazeboserver_link_libs} )
+
INSTALL (TARGETS gazebo-exec DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+INSTALL (TARGETS gazebo_server DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
INSTALL (FILES ${gazeboserver_headers} DESTINATION
${CMAKE_INSTALL_PREFIX}/include/gazebo COMPONENT headers)
########################################
Modified: code/gazebo/trunk/server/audio_video/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/audio_video/CMakeLists.txt 2009-05-14 00:34:36 UTC
(rev 7652)
+++ code/gazebo/trunk/server/audio_video/CMakeLists.txt 2009-05-14 01:29:27 UTC
(rev 7653)
@@ -1,11 +1,3 @@
-INCLUDE_DIRECTORIES(
- ${CMAKE_SOURCE_DIR}/server
- ${LIBAVCODEC_PATH}
- ${LIBAVFORMAT_PATH}
- ${gazeboserver_include_dirs}
- ${boost_include_dirs}
-)
-
SET (sources AudioDecoder.cc
OpenAL.cc
)
@@ -14,6 +6,7 @@
OpenAL.hh
)
+APPEND_TO_SERVER_SOURCES(${sources})
APPEND_TO_SERVER_HEADERS(${headers})
-ADD_LIBRARY(gazebo_av STATIC ${sources})
+#ADD_LIBRARY(gazebo_av STATIC ${sources})
Modified: code/gazebo/trunk/server/controllers/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/controllers/CMakeLists.txt 2009-05-14 00:34:36 UTC
(rev 7652)
+++ code/gazebo/trunk/server/controllers/CMakeLists.txt 2009-05-14 01:29:27 UTC
(rev 7653)
@@ -1,21 +1,5 @@
include (${gazebo_cmake_dir}/GazeboUtils.cmake)
-INCLUDE_DIRECTORIES(
- .
- ${CMAKE_SOURCE_DIR}/libgazebo
- ${CMAKE_SOURCE_DIR}/server
- ${CMAKE_SOURCE_DIR}/server/audio_video
- ${CMAKE_SOURCE_DIR}/server/physics
- ${CMAKE_SOURCE_DIR}/server/rendering
- ${CMAKE_SOURCE_DIR}/server/sensors
- ${CMAKE_SOURCE_DIR}/server/sensors/camera
- ${CMAKE_SOURCE_DIR}/server/sensors/contact
- ${CMAKE_SOURCE_DIR}/server/sensors/imu
- ${CMAKE_SOURCE_DIR}/server/sensors/ir
- ${CMAKE_SOURCE_DIR}/server/sensors/ray
- ${gazeboserver_include_dirs}
-)
-
ADD_SUBDIRECTORY(actarray)
ADD_SUBDIRECTORY(bumper)
ADD_SUBDIRECTORY(camera)
Modified: code/gazebo/trunk/server/gui/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/gui/CMakeLists.txt 2009-05-14 00:34:36 UTC (rev
7652)
+++ code/gazebo/trunk/server/gui/CMakeLists.txt 2009-05-14 01:29:27 UTC (rev
7653)
@@ -1,12 +1,3 @@
-INCLUDE_DIRECTORIES(
- ${CMAKE_SOURCE_DIR}/libgazebo
- ${CMAKE_SOURCE_DIR}/server
- ${CMAKE_SOURCE_DIR}/server/rendering
- ${CMAKE_SOURCE_DIR}/server/physics
- ${gazeboserver_include_dirs}
- ${boost_include_dirs}
-)
-
SET (sources Gui.cc
GLWindow.cc
MainMenu.cc
@@ -24,6 +15,7 @@
GLFrameManager.hh
GLFrame.hh
)
-ADD_LIBRARY(gazebo_gui STATIC ${sources})
+#ADD_LIBRARY(gazebo_gui STATIC ${sources})
+APPEND_TO_SERVER_SOURCES(${sources})
APPEND_TO_SERVER_HEADERS(${headers})
Modified: code/gazebo/trunk/server/physics/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/physics/CMakeLists.txt 2009-05-14 00:34:36 UTC
(rev 7652)
+++ code/gazebo/trunk/server/physics/CMakeLists.txt 2009-05-14 01:29:27 UTC
(rev 7653)
@@ -1,14 +1,5 @@
include (${gazebo_cmake_dir}/GazeboUtils.cmake)
-INCLUDE_DIRECTORIES(.
- ode
- ${CMAKE_SOURCE_DIR}/libgazebo
- ${CMAKE_SOURCE_DIR}/server
- ${CMAKE_SOURCE_DIR}/server/rendering
- ${CMAKE_SOURCE_DIR}/server/sensors
- ${gazeboserver_include_dirs}
- ${boost_include_dirs}
-)
SET (sources BallJoint.cc
Body.cc
@@ -52,5 +43,6 @@
ode/ODEPhysics.hh
)
-ADD_LIBRARY(gazebo_physics STATIC ${sources})
+#ADD_LIBRARY(gazebo_physics STATIC ${sources})
+APPEND_TO_SERVER_SOURCES(${sources})
APPEND_TO_SERVER_HEADERS(${headers})
Modified: code/gazebo/trunk/server/rendering/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/rendering/CMakeLists.txt 2009-05-14 00:34:36 UTC
(rev 7652)
+++ code/gazebo/trunk/server/rendering/CMakeLists.txt 2009-05-14 01:29:27 UTC
(rev 7653)
@@ -1,11 +1,5 @@
include (${gazebo_cmake_dir}/GazeboUtils.cmake)
-INCLUDE_DIRECTORIES(
- ${CMAKE_SOURCE_DIR}/server
- ${CMAKE_SOURCE_DIR}/server/gui
- ${gazeboserver_include_dirs}
- ${boost_include_dirs}
-)
SET (sources OgreMovableText.cc
OgreCreator.cc
@@ -41,5 +35,6 @@
OgreHeightmap.hh
)
-ADD_LIBRARY(gazebo_rendering ${sources})
+#ADD_LIBRARY(gazebo_rendering ${sources})
+APPEND_TO_SERVER_SOURCES(${sources})
APPEND_TO_SERVER_HEADERS(${headers})
Modified: code/gazebo/trunk/server/sensors/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/sensors/CMakeLists.txt 2009-05-14 00:34:36 UTC
(rev 7652)
+++ code/gazebo/trunk/server/sensors/CMakeLists.txt 2009-05-14 01:29:27 UTC
(rev 7653)
@@ -1,22 +1,5 @@
include (${gazebo_cmake_dir}/GazeboUtils.cmake)
-INCLUDE_DIRECTORIES (
- .
- ${CMAKE_SOURCE_DIR}/libgazebo
- ${CMAKE_SOURCE_DIR}/server
- ${CMAKE_SOURCE_DIR}/server/controllers
- ${CMAKE_SOURCE_DIR}/server/physics
- ${CMAKE_SOURCE_DIR}/server/physics/ode
- ${CMAKE_SOURCE_DIR}/server/rendering
- ${gazeboserver_include_dirs}
- ${boost_include_dirs}
-)
-
-LINK_DIRECTORIES(
-
- ${CMAKE_SOURCE_DIR}/libgazebo
- )
-
ADD_SUBDIRECTORY(camera)
ADD_SUBDIRECTORY(contact)
ADD_SUBDIRECTORY(imu)
@@ -31,5 +14,6 @@
SensorFactory.hh
)
-ADD_LIBRARY(gazebo_sensors STATIC ${gazebosensor_sources} ${sources})
+#ADD_LIBRARY(gazebo_sensors STATIC ${gazebosensor_sources} ${sources})
+APPEND_TO_SERVER_SOURCES(${sources})
APPEND_TO_SERVER_HEADERS(${headers})
Modified: code/gazebo/trunk/server/sensors/camera/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/sensors/camera/CMakeLists.txt 2009-05-14
00:34:36 UTC (rev 7652)
+++ code/gazebo/trunk/server/sensors/camera/CMakeLists.txt 2009-05-14
01:29:27 UTC (rev 7653)
@@ -9,5 +9,5 @@
)
-APPEND_TO_SENSOR_SOURCES(${sources})
+APPEND_TO_SERVER_SOURCES(${sources})
APPEND_TO_SERVER_HEADERS(${headers})
Modified: code/gazebo/trunk/server/sensors/contact/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/sensors/contact/CMakeLists.txt 2009-05-14
00:34:36 UTC (rev 7652)
+++ code/gazebo/trunk/server/sensors/contact/CMakeLists.txt 2009-05-14
01:29:27 UTC (rev 7653)
@@ -3,5 +3,5 @@
set (sources ContactSensor.cc)
set (headers ContactSensor.hh)
-APPEND_TO_SENSOR_SOURCES(${sources})
+APPEND_TO_SERVER_SOURCES(${sources})
APPEND_TO_SERVER_HEADERS(${headers})
Modified: code/gazebo/trunk/server/sensors/imu/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/sensors/imu/CMakeLists.txt 2009-05-14 00:34:36 UTC
(rev 7652)
+++ code/gazebo/trunk/server/sensors/imu/CMakeLists.txt 2009-05-14 01:29:27 UTC
(rev 7653)
@@ -3,5 +3,5 @@
set (sources ImuSensor.cc)
set (headers ImuSensor.hh)
-APPEND_TO_SENSOR_SOURCES(${sources})
+APPEND_TO_SERVER_SOURCES(${sources})
APPEND_TO_SERVER_HEADERS(${headers})
Modified: code/gazebo/trunk/server/sensors/ir/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/sensors/ir/CMakeLists.txt 2009-05-14 00:34:36 UTC
(rev 7652)
+++ code/gazebo/trunk/server/sensors/ir/CMakeLists.txt 2009-05-14 01:29:27 UTC
(rev 7653)
@@ -3,5 +3,5 @@
set (sources IRSensor.cc)
set (headers IRSensor.hh)
-APPEND_TO_SENSOR_SOURCES(${sources})
+APPEND_TO_SERVER_SOURCES(${sources})
APPEND_TO_SERVER_HEADERS(${headers})
Modified: code/gazebo/trunk/server/sensors/ray/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/sensors/ray/CMakeLists.txt 2009-05-14 00:34:36 UTC
(rev 7652)
+++ code/gazebo/trunk/server/sensors/ray/CMakeLists.txt 2009-05-14 01:29:27 UTC
(rev 7653)
@@ -3,5 +3,5 @@
set (sources RaySensor.cc)
set (headers RaySensor.hh)
-APPEND_TO_SENSOR_SOURCES(${sources})
+APPEND_TO_SERVER_SOURCES(${sources})
APPEND_TO_SERVER_HEADERS(${headers})
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
