From ce0fcc860a25943dacf146657b53c79e2862d153 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Wed, 28 Sep 2016 10:53:16 +0200 Subject: [PATCH] [urdf] address gcc6 build error and tune (#157) With gcc6, compiling fails with `stdlib.h: No such file or directory`, as including '-isystem /usr/include' breaks with gcc6, cf., https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129. This commit addresses this issue for this package in the same way it was addressed in various other ROS packages. A list of related commits and pull requests is at: https://github.com/ros/rosdistro/issues/12783 Signed-off-by: Lukas Bulwahn --- urdf/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt index 45b2270..586eb0f 100644 --- a/urdf/CMakeLists.txt +++ b/urdf/CMakeLists.txt @@ -17,17 +17,16 @@ catkin_package( DEPENDS urdfdom_headers urdfdom Boost ) -include_directories(SYSTEM ${Boost_INCLUDE_DIR}) -link_directories(${Boost_LIBRARY_DIRS}) - include_directories( include ${catkin_INCLUDE_DIRS} + ${Boost_INCLUDE_DIR} ${urdfdom_INCLUDE_DIRS} ${urdfdom_headers_INCLUDE_DIRS} ${TinyXML_INCLUDE_DIRS} ) -link_directories(${catkin_LIBRARY_DIRS}) + +link_directories(${catkin_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS}) add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp) target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES})