Revision: 7379
http://playerstage.svn.sourceforge.net/playerstage/?rev=7379&view=rev
Author: rtv
Date: 2009-03-08 02:35:03 +0000 (Sun, 08 Mar 2009)
Log Message:
-----------
build improvements
Modified Paths:
--------------
code/branches/federation/stage/CMakeLists.txt
code/branches/federation/stage/examples/ctrl/CMakeLists.txt
code/branches/federation/stage/examples/gzfed/CMakeLists.txt
Modified: code/branches/federation/stage/CMakeLists.txt
===================================================================
--- code/branches/federation/stage/CMakeLists.txt 2009-03-08 02:34:23 UTC
(rev 7378)
+++ code/branches/federation/stage/CMakeLists.txt 2009-03-08 02:35:03 UTC
(rev 7379)
@@ -60,15 +60,6 @@
SET( INDENT " * " )
-pkg_search_module( GAZEBO REQUIRED libgazebo )
-IF( GAZEBO_FOUND )
- MESSAGE( STATUS ${INDENT} "Gazebo version ${GAZEBO_VERSION} detected at
${GAZEBO_PREFIX}" )
- MESSAGE( STATUS " GAZEBO_CFLAGS = ${GAZEBO_CFLAGS}" )
- MESSAGE( STATUS " GAZEBO_LDFLAGS = ${GAZEBO_LDFLAGS}" )
-ELSE( GAZEBO_FOUND )
- MESSAGE( ${INDENT} "Gazebo not detected" )
-ENDIF( GAZEBO_FOUND )
-
pkg_search_module( GLIB REQUIRED gthread-2.0 )
IF( GLIB_FOUND )
MESSAGE( STATUS ${INDENT} "Glib version ${GLIB_VERSION} detected at
${GLIB_PREFIX}" )
@@ -184,7 +175,6 @@
${GLIB_INCLUDE_DIRS}
${LIBPNG_INCLUDE_DIRS}
${CMAKE_INCLUDE_PATH}
- ${GAZEBO_INCLUDE_PATH}
)
@@ -192,7 +182,6 @@
link_directories(${GLIB_LIBRARY_DIRS}
${GLIB_LIBRARY_DIRS}
${LIBPNG_LIBRARY_DIRS}
- ${GAZEBO_LIBRARY_DIRS}
)
# work through these subdirs
Modified: code/branches/federation/stage/examples/ctrl/CMakeLists.txt
===================================================================
--- code/branches/federation/stage/examples/ctrl/CMakeLists.txt 2009-03-08
02:34:23 UTC (rev 7378)
+++ code/branches/federation/stage/examples/ctrl/CMakeLists.txt 2009-03-08
02:35:03 UTC (rev 7379)
@@ -9,14 +9,13 @@
# create a library module for each plugin and link libstage to each
-
-
foreach( PLUGIN ${PLUGINS} )
ADD_LIBRARY( ${PLUGIN} MODULE ${PLUGIN}.cc )
TARGET_LINK_LIBRARIES( ${PLUGIN} stage )
- set_source_files_properties( ${PLUGIN}.cc PROPERTIES COMPILE_FLAGS
"${FLTK_CFLAGS}" )
endforeach( PLUGIN )
+# SET_TARGET_PROPERTIES( ${PLUGINS} PROPERTIES COMPILE_FLAGS "${FLTK_CFLAGS}")
+
# delete the "lib" prefix from the plugin libraries
SET_TARGET_PROPERTIES( ${PLUGINS} PROPERTIES PREFIX "" )
Modified: code/branches/federation/stage/examples/gzfed/CMakeLists.txt
===================================================================
--- code/branches/federation/stage/examples/gzfed/CMakeLists.txt
2009-03-08 02:34:23 UTC (rev 7378)
+++ code/branches/federation/stage/examples/gzfed/CMakeLists.txt
2009-03-08 02:35:03 UTC (rev 7379)
@@ -1,18 +1,36 @@
-SET( GZPLUGINS
- gzwander
-)
-
-# create a library module for each plugin and link libstage and libgazebo to
each
-foreach( PLUGIN ${GZPLUGINS} )
- ADD_LIBRARY( ${PLUGIN} MODULE ${PLUGIN}.cc )
- TARGET_LINK_LIBRARIES( ${PLUGIN} stage ${GAZEBO_LIBRARIES})
- set_source_files_properties( ${PLUGIN}.cc PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS}")
-endforeach( PLUGIN )
+
+pkg_search_module( GAZEBO REQUIRED libgazebo )
+IF( GAZEBO_FOUND )
+ MESSAGE( STATUS ${INDENT} "Gazebo version ${GAZEBO_VERSION} detected at
${GAZEBO_PREFIX}" )
+ MESSAGE( STATUS " GAZEBO_CFLAGS = ${GAZEBO_CFLAGS}" )
+ MESSAGE( STATUS " GAZEBO_LIBRARIES = ${GAZEBO_LIBRARIES}" )
+ELSE( GAZEBO_FOUND )
+ MESSAGE( ${INDENT} "Gazebo not detected" )
+ENDIF( GAZEBO_FOUND )
-# delete the "lib" prefix from the plugin libraries
-SET_TARGET_PROPERTIES( ${GZPLUGINS} PROPERTIES PREFIX "" )
-# install in <prefix>/lib
-INSTALL( TARGETS ${GZPLUGINS} DESTINATION lib)
+IF( GAZEBO_FOUND )
+ SET( GZPLUGINS
+ gzwander
+ )
+
+ link_directories( ${GAZEBO_LIBRARY_DIRS} )
+ include_directories( ${GAZEBO_INCLUDE_PATH} )
+
+ # create a library module for each plugin and link stage and gazebo to each
+ foreach( PLUGIN ${GZPLUGINS} )
+ ADD_LIBRARY( ${PLUGIN} MODULE ${PLUGIN}.cc )
+ TARGET_LINK_LIBRARIES( ${PLUGIN} stage ${GAZEBO_LIBRARIES})
+ endforeach( PLUGIN )
+
+ SET_TARGET_PROPERTIES( ${GZPLUGINS} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS}")
+
+ # delete the "lib" prefix from the plugin libraries
+ SET_TARGET_PROPERTIES( ${GZPLUGINS} PROPERTIES PREFIX "" )
+
+ # install in <prefix>/lib
+ INSTALL( TARGETS ${GZPLUGINS} DESTINATION lib)
+
+ENDIF( GAZEBO_FOUND )
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
