Changes have been pushed for the project "Fawkes Robotics Software Framework".
Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/rosnav-webview_msgs has been created at e4e47e0daf4ea64a9a27f1fa404c3bbcce81d096 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/rosnav-webview_msgs - *Log* --------------------------------------------------------------- commit e4e47e0daf4ea64a9a27f1fa404c3bbcce81d096 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Jan 11 14:46:00 2013 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Jan 11 14:46:00 2013 +0100 ros-navigator: don't build if webview_msgs package is not available http://git.fawkesrobotics.org/fawkes.git/commit/e4e47e0 http://trac.fawkesrobotics.org/changeset/e4e47e0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- - *Diffs* ------------------------------------------------------------- - *commit* e4e47e0daf4ea64a9a27f1fa404c3bbcce81d096 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Fri Jan 11 14:46:00 2013 +0100 Subject: ros-navigator: don't build if webview_msgs package is not available src/plugins/ros/Makefile | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) _Diff for modified files_: diff --git a/src/plugins/ros/Makefile b/src/plugins/ros/Makefile index eb4bab0..fa7513d 100644 --- a/src/plugins/ros/Makefile +++ b/src/plugins/ros/Makefile @@ -153,23 +153,27 @@ ifeq ($(HAVE_ROS),1) endif ifeq ($(call ros-have-pkg,move_base_msgs),1) - ifeq ($(call ros-have-pkg,actionlib),1) - ifeq ($(HAVE_TF),1) - CFLAGS_navigator_thread += $(call ros-pkg-cflags,move_base_msgs) \ - $(call ros-pkg-cflags,actionlib) \ - $(call boost-lib-cflags,thread) \ - $(CFLAGS) $(CFLAGS_TF) - CFLAGS_navigator_plugin = $(CFLAGS_navigator_thread) - LDFLAGS_ros_navigator += $(call ros-pkg-lflags,move_base_msgs) \ - $(call ros-pkg-lflags,actionlib) \ - $(call boost-lib-ldflags,thread) \ - $(LDFLAGS_TF) - PLUGINS_all += $(PLUGINDIR)/ros-navigator.so + ifeq ($call(ros-have-pkg,webview_msgs),1) + ifeq ($(call ros-have-pkg,actionlib),1) + ifeq ($(HAVE_TF),1) + CFLAGS_navigator_thread += $(call ros-pkg-cflags,move_base_msgs) \ + $(call ros-pkg-cflags,actionlib) \ + $(call boost-lib-cflags,thread) \ + $(CFLAGS) $(CFLAGS_TF) + CFLAGS_navigator_plugin = $(CFLAGS_navigator_thread) + LDFLAGS_ros_navigator += $(call ros-pkg-lflags,move_base_msgs) \ + $(call ros-pkg-lflags,actionlib) \ + $(call boost-lib-ldflags,thread) \ + $(LDFLAGS_TF) + PLUGINS_all += $(PLUGINDIR)/ros-navigator.so + else + WARN_TARGETS += warning_navigator_tf + endif else - WARN_TARGETS += warning_navigator_tf + WARN_TARGETS += warning_actionlib endif else - WARN_TARGETS += warning_actionlib + WARN_TARGETS += warning_navigator_webview_msgs endif else WARN_TARGETS += warning_move_base_msgs @@ -211,6 +215,9 @@ warning_navigator_tf: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting ROS navigator Plugin$(TNORMAL) (Fawkes TF library not available)" warning_actionlib: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting ROS navigator Plugin$(TNORMAL) (ROS package actionlib not found)" +warning_navigator_webview_msgs: + $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting ROS navigator Plugin$(TNORMAL) (ROS package webview_msgs not found)" + endif include $(BUILDSYSDIR)/base.mk -- Fawkes Robotics Framework http://www.fawkesrobotics.org _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
