From ce5bd9badb10aeb72a2af2b0e905d6ef99aa5971 Mon Sep 17 00:00:00 2001 From: William Woodall Date: Wed, 4 Jan 2017 16:56:35 -0800 Subject: [PATCH] [urdf] address gcc6 build error and tune (#156) (#173) 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt index e6fc0dc..eeed0bd 100644 --- a/urdf/CMakeLists.txt +++ b/urdf/CMakeLists.txt @@ -29,17 +29,16 @@ catkin_package( ) install(FILES ${generated_compat_header} DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) - include_directories( include - ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIR} + ${catkin_INCLUDE_DIRS} ${urdfdom_INCLUDE_DIRS} ${urdfdom_headers_INCLUDE_DIRS} ${TinyXML_INCLUDE_DIRS} ) -link_directories(${catkin_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS}) +link_directories(${Boost_LIBRARY_DIRS} ${catkin_LIBRARY_DIRS}) add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp) target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES})