Add Boost_include_dirs to cmake include_dirs

This seems to be necessary because of our own boost installation

3 files changed, 24 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 581da5490568..c4080dc28c30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-melodic-tracetools
 	pkgdesc = ROS - Wrapper interface for tracing libraries.
 	pkgver = 0.2.1
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/bosch-robotics-cr/tracetools
 	arch = i686
 	arch = x86_64
@@ -15,7 +15,9 @@ pkgbase = ros-melodic-tracetools
 	makedepends = boost1.69
 	makedepends = pkg-config
 	source = ros-melodic-tracetools-0.2.1.tar.gz::https://github.com/bosch-robotics-cr/tracetools/archive/0.2.1.tar.gz
+	source = boost_include_dirs.patch
 	sha256sums = 3a2aa03551d6de84939260bb4e02b528bec53de81f0bebf44cc4f4610470eaff
+	sha256sums = 87968984af285978048fa603fa58cc3a93ae9fbe631da924dfe256e270747fd0
 
 pkgname = ros-melodic-tracetools
 
diff --git a/PKGBUILD b/PKGBUILD
index e2567369a199..ade2b605f061 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ url='https://github.com/bosch-robotics-cr/tracetools'
 pkgname='ros-melodic-tracetools'
 pkgver='0.2.1'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=5
+pkgrel=6
 license=('APLv2')
 
 ros_makedepends=(ros-melodic-catkin)
@@ -19,8 +19,15 @@ ros_depends=()
 depends=(${ros_depends[@]})
 
 _dir="ros1_tracetools-${pkgver}"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/bosch-robotics-cr/tracetools/archive/${pkgver}.tar.gz")
-sha256sums=('3a2aa03551d6de84939260bb4e02b528bec53de81f0bebf44cc4f4610470eaff')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/bosch-robotics-cr/tracetools/archive/${pkgver}.tar.gz"
+"boost_include_dirs.patch")
+sha256sums=('3a2aa03551d6de84939260bb4e02b528bec53de81f0bebf44cc4f4610470eaff'
+            '87968984af285978048fa603fa58cc3a93ae9fbe631da924dfe256e270747fd0')
+
+prepare() {
+  cd ${srcdir}/${_dir}
+  patch -uN CMakeLists.txt ${srcdir}/boost_include_dirs.patch || return 1
+}
 
 build() {
   # Use ROS environment variables
diff --git a/boost_include_dirs.patch b/boost_include_dirs.patch
new file mode 100644
index 000000000000..9d09a26944a0
--- /dev/null
+++ b/boost_include_dirs.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.old	2021-01-28 22:37:28.458179329 +0100
++++ CMakeLists.txt	2021-01-28 22:36:56.678194692 +0100
+@@ -56,7 +56,7 @@
+ 
+ ## Specify additional locations of header files
+ ## Your package locations should be listed before other locations
+-include_directories(include ${catkin_INCLUDE_DIRS})
++include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+ if(WITH_LTTNG)
+ 	include_directories(${LTTNG_INCLUDEDIR})
+ endif()