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/kdl_parser has been updated to 2134d7be7d4459115d30661cff7b350e2b5f424f (commit) from b5a5a4a15f18f2fb06ce3927b09a3a5656a72611 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/kdl_parser Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --------------------------------------------------------------- commit 2134d7be7d4459115d30661cff7b350e2b5f424f Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon Feb 24 16:53:29 2014 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Mon Feb 24 16:53:29 2014 +0100 kdl_parser: add tinyxml dependency to Makefile http://git.fawkesrobotics.org/fawkes.git/commit/2134d7b http://trac.fawkesrobotics.org/changeset/2134d7b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/libs/kdl_parser/Makefile | 7 ++++++- src/libs/kdl_parser/kdl_parser.mk | 19 +++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 2134d7be7d4459115d30661cff7b350e2b5f424f - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon Feb 24 16:53:29 2014 +0100 Subject: kdl_parser: add tinyxml dependency to Makefile src/libs/kdl_parser/Makefile | 7 ++++++- src/libs/kdl_parser/kdl_parser.mk | 19 +++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) _Diff for modified files_: diff --git a/src/libs/kdl_parser/Makefile b/src/libs/kdl_parser/Makefile index eb5bb33..951bd70 100644 --- a/src/libs/kdl_parser/Makefile +++ b/src/libs/kdl_parser/Makefile @@ -36,17 +36,22 @@ else ifneq ($(HAVE_URDFDOM),1) WARN_TARGETS += warning_urdfdom endif + ifneq ($(HAVE_TINYXML),1) + WARN_TARGETS += warning_tinyxml + endif endif ifeq ($(OBJSSUBMAKE),1) all: $(WARN_TARGETS) -.PHONY: warning_kdl warning_urdfdomheaders warning_urdfdom +.PHONY: warning_kdl warning_urdfdomheaders warning_urdfdom warning_tinyxml warning_kdl: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting KDL parser library$(TNORMAL) (orocos-kdl[-devel] not available)" warning_urdfdomheaders: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting KDL parser library$(TNORMAL) (urdfdom-headers[-devel] not available)" warning_urdfdom: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting KDL parser library$(TNORMAL) (urdfdom[-devel] not available)" +warning_tinyxml: + $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting KDL parser library$(TNORMAL) (tinyxml not available)" endif include $(BUILDSYSDIR)/base.mk diff --git a/src/libs/kdl_parser/kdl_parser.mk b/src/libs/kdl_parser/kdl_parser.mk index be3290d..baf72bb 100644 --- a/src/libs/kdl_parser/kdl_parser.mk +++ b/src/libs/kdl_parser/kdl_parser.mk @@ -28,19 +28,22 @@ endif HAVE_URDFDOMHEADERS=$(if $(shell $(PKGCONFIG) --exists 'urdfdom_headers'; echo $${?/1/}),1,0) HAVE_URDFDOM=$(if $(shell $(PKGCONFIG) --exists 'urdfdom'; echo $${?/1/}),1,0) +HAVE_TINYXML=$(if $(wildcard $(SYSROOT)/usr/include/tinyxml.h),1,0) ifeq ($(HAVE_KDL),1) ifeq ($(HAVE_URDFDOMHEADERS),1) ifeq ($(HAVE_URDFDOM),1) - CFLAGS_KDLPARSER = $(CFLAGS_KDL) \ - $(shell $(PKGCONFIG) --cflags 'urdfdom_headers') \ - $(shell $(PKGCONFIG) --cflags 'urdfdom') - LDFLAGS_KDLPARSER = $(LDFLAGS_KDL) \ - $(shell $(PKGCONFIG) --libs 'urdfdom_headers') \ - $(shell $(PKGCONFIG) --libs 'urdfdom') \ - -ltinyxml - HAVE_KDLPARSER=1 + ifeq ($(HAVE_TINYXML),1) + CFLAGS_KDLPARSER = $(CFLAGS_KDL) \ + $(shell $(PKGCONFIG) --cflags 'urdfdom_headers') \ + $(shell $(PKGCONFIG) --cflags 'urdfdom') + LDFLAGS_KDLPARSER = $(LDFLAGS_KDL) \ + $(shell $(PKGCONFIG) --libs 'urdfdom_headers') \ + $(shell $(PKGCONFIG) --libs 'urdfdom') \ + -ltinyxml + HAVE_KDLPARSER=1 + endif endif endif endif -- 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
