apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug building on artful.

Browse Source 
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 <clalancette@openrobotics.org>
This commit is contained in:
Chris Lalancette 2018-05-02 14:50:33 +00:00
parent 3e97d7ce9c
commit 242ce31b32
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcl_conversions/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 3.7)
project(pcl_conversions) project(pcl_conversions)
find_package(catkin REQUIRED COMPONENTS) find_package(catkin REQUIRED COMPONENTS)
@ -6,6 +6,16 @@ find_package(catkin REQUIRED COMPONENTS)
find_package(PCL REQUIRED COMPONENTS common io) find_package(PCL REQUIRED COMPONENTS common io)
find_package(Eigen3 REQUIRED) 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( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
CATKIN_DEPENDS pcl_msgs roscpp sensor_msgs std_msgs CATKIN_DEPENDS pcl_msgs roscpp sensor_msgs std_msgs

2
pcl_conversions/README.rst
View File

@ -15,7 +15,7 @@ Code & tickets
+-----------------+------------------------------------------------------------+ +-----------------+------------------------------------------------------------+
| pcl_conversions | http://ros.org/wiki/pcl_conversions | | 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 | .. | Documentation | http://ros-perception.github.com/pcl_conversions/doc |
.. +-----------------+------------------------------------------------------------+ .. +-----------------+------------------------------------------------------------+