[ros-ros-comm] 01/01: Add hack to support xmlrpcpp includes without path specification

Jochen Sprickerhof jspricke-guest at moszumanska.debian.org
Mon Jan 18 22:52:54 UTC 2016


This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-ros-comm.

commit e8b996350a3da99faf8cecf30ff92279c3b1cf02
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Jan 18 23:52:26 2016 +0100

    Add hack to support xmlrpcpp includes without path specification
---
 debian/rules | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 4b04066..b560ed6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,15 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
 %:
-	dh  $@ --parallel --with=python2 --buildsystem=cmake
+	dh  $@ --parallel --with=python2 --buildsystem=cmake --builddirectory=build
+
+# Due to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810990 we moved the
+# xmlrpcpp includes to /usr/include/xmlrpcpp. As this is different to ROS
+# upstream, we add the path to the cmake file, so all includes are found
+# without the xmlrpcpp path as well.
+override_dh_auto_configure:
+	dh_auto_configure
+	sed -i -e 's#set(_include_dirs "include")#set(_include_dirs "include;/usr/include/xmlrpcpp")#' build/utilities/xmlrpcpp/catkin_generated/installspace/xmlrpcppConfig.cmake
 
 get-orig-source:
 	uscan --verbose --force-download --repack --compress xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-ros-comm.git



More information about the debian-science-commits mailing list