bkinnightskytw
/
kdl_parser
mirror of https://github.com/existedinnettw/kdl_parser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from ros/fix_indigo_deps 

update usage of urdfdom_headers for indigo/trusty
This commit is contained in:
Tully Foote 2014-06-24 19:56:54 -07:00
parent cca530eb54 26639f39ba
commit 1c6eee7458
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
collada_parser/CMakeLists.txt
View File

@ -3,7 +3,8 @@ project(collada_parser)
find_package(Boost REQUIRED system) find_package(Boost REQUIRED system)
find_package(catkin REQUIRED COMPONENTS urdfdom_headers urdf_parser_plugin roscpp class_loader) find_package(catkin REQUIRED COMPONENTS urdf_parser_plugin roscpp class_loader)
find_package(urdfdom_headers REQUIRED)
catkin_package( catkin_package(
LIBRARIES ${PROJECT_NAME} LIBRARIES ${PROJECT_NAME}
@ -13,7 +14,7 @@ catkin_package(
) )
include_directories(${Boost_INCLUDE_DIR}) include_directories(${Boost_INCLUDE_DIR})
include_directories(include ${catkin_INCLUDE_DIRS}) include_directories(include ${catkin_INCLUDE_DIRS} ${urdfdom_headers_INCLUDE_DIRS})
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake-extensions/) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake-extensions/)
find_package(PkgConfig) find_package(PkgConfig)

5
urdf_parser_plugin/CMakeLists.txt
View File

@ -1,14 +1,13 @@
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 2.8.3)
project(urdf_parser_plugin) project(urdf_parser_plugin)
find_package(catkin REQUIRED urdfdom_headers) find_package(catkin REQUIRED)
find_package(urdfdom_headers REQUIRED)
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
DEPENDS urdfdom_headers DEPENDS urdfdom_headers
) )
include_directories(include)
install(DIRECTORY include/${PROJECT_NAME}/ install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})