From 242ce31b32da388b4163175c9e25dd20790cd9d7 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Wed, 2 May 2018 14:50:33 +0000 Subject: [PATCH] Fix a bug building on artful. The comment explains it in more detail. While we are at it, fix the link in the README.rst to point to the right repository. Signed-off-by: Chris Lalancette --- pcl_conversions/CMakeLists.txt | 12 +++++++++++- pcl_conversions/README.rst | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pcl_conversions/CMakeLists.txt b/pcl_conversions/CMakeLists.txt index 28e23bef..d7e59c64 100644 --- a/pcl_conversions/CMakeLists.txt +++ b/pcl_conversions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.7) project(pcl_conversions) find_package(catkin REQUIRED COMPONENTS) @@ -6,6 +6,16 @@ find_package(catkin REQUIRED COMPONENTS) find_package(PCL REQUIRED COMPONENTS common io) find_package(Eigen3 REQUIRED) +# There is a bug in the Ubuntu Artful (17.10) version of the VTK package, +# where it includes /usr/include/*-linux-gnu/freetype2 in the include +# directories (which doesn't exist). This filters down to the PCL_INCLUDE_DIRS, +# and causes downstream projects trying to use these libraries to fail to +# configure properly. Here we remove those bogus entries so that downstream +# consumers of this package succeed. +if(NOT "${PCL_INCLUDE_DIRS}" STREQUAL "") + list(FILTER PCL_INCLUDE_DIRS EXCLUDE REGEX "/usr/include/.*-linux-gnu/freetype2") +endif() + catkin_package( INCLUDE_DIRS include CATKIN_DEPENDS pcl_msgs roscpp sensor_msgs std_msgs diff --git a/pcl_conversions/README.rst b/pcl_conversions/README.rst index 4ec7b6a5..2478c439 100644 --- a/pcl_conversions/README.rst +++ b/pcl_conversions/README.rst @@ -15,7 +15,7 @@ Code & tickets +-----------------+------------------------------------------------------------+ | pcl_conversions | http://ros.org/wiki/pcl_conversions | +-----------------+------------------------------------------------------------+ -| Issues | http://github.com/ros-perception/pcl_conversions/issues | +| Issues | http://github.com/ros-perception/perception_pcl/issues | +-----------------+------------------------------------------------------------+ .. | Documentation | http://ros-perception.github.com/pcl_conversions/doc | .. +-----------------+------------------------------------------------------------+