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

Merge pull request #196 from clalancette/fix-artful

Browse Source 
Fix a bug building on artful.
This commit is contained in:
Paul Bovbel 2018-05-02 11:10:24 -04:00 committed by GitHub
commit f335c169df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)
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

2
pcl_conversions/README.rst
View File

@ -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 |
.. +-----------------+------------------------------------------------------------+