[ros-geometry-experimental] 01/01: Add patch for tf2*Config.cmake

[Jochen Sprickerhof]

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

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

commit 4613e9493d772c9c3927e95970a7819865bf2422
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Nov 10 22:17:14 2015 +0100

    Add patch for tf2*Config.cmake
---
 ...ort-catkin-includes-into-tf2-Config.cmake.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/0004-Don-t-export-catkin-includes-into-tf2-Config.cmake.patch b/debian/patches/0004-Don-t-export-catkin-includes-into-tf2-Config.cmake.patch
new file mode 100644
index 0000000..238a437
--- /dev/null
+++ b/debian/patches/0004-Don-t-export-catkin-includes-into-tf2-Config.cmake.patch
@@ -0,0 +1,36 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 10 Nov 2015 22:13:39 +0100
+Subject: Don't export catkin includes into tf2*Config.cmake
+
+They only include the temporary include in the build directory.
+---
+ tf2_bullet/CMakeLists.txt | 2 +-
+ tf2_kdl/CMakeLists.txt    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tf2_bullet/CMakeLists.txt b/tf2_bullet/CMakeLists.txt
+index dd4cc04..3b10ea2 100644
+--- a/tf2_bullet/CMakeLists.txt
++++ b/tf2_bullet/CMakeLists.txt
+@@ -10,7 +10,7 @@ find_package(catkin REQUIRED COMPONENTS geometry_msgs tf2)
+ 
+ include_directories(include ${bullet_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
+ 
+-catkin_package(INCLUDE_DIRS include ${bullet_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
++catkin_package(INCLUDE_DIRS include ${bullet_INCLUDE_DIRS})
+ 
+ install(DIRECTORY include/${PROJECT_NAME}/
+         DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
+diff --git a/tf2_kdl/CMakeLists.txt b/tf2_kdl/CMakeLists.txt
+index 1e35e1f..ca1415f 100644
+--- a/tf2_kdl/CMakeLists.txt
++++ b/tf2_kdl/CMakeLists.txt
+@@ -7,7 +7,7 @@ find_package(catkin REQUIRED COMPONENTS cmake_modules tf2 tf2_ros tf2_msgs)
+ find_package(Eigen REQUIRED)
+ 
+ catkin_package(
+-  INCLUDE_DIRS include ${catkin_INCLUDE_DIRS} ${Eigen_INCLUDE_DIRS}
++  INCLUDE_DIRS include ${Eigen_INCLUDE_DIRS}
+   DEPENDS Eigen orocos_kdl
+ )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 720260a..0e1cfd5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Added-CMakeLists-to-build-the-package.patch
 0002-Add-Debian-specific-SONAME.patch
 0003-Remove-old-load_manifest-from-view_frames.patch
+0004-Don-t-export-catkin-includes-into-tf2-Config.cmake.patch

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