change user of urdfdom, as it is not a catkin pkg
This commit is contained in:
parent
e0da73e8a4
commit
455b57c76d
|
@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 2.8.3)
|
||||||
project(urdf)
|
project(urdf)
|
||||||
|
|
||||||
find_package(Boost REQUIRED thread)
|
find_package(Boost REQUIRED thread)
|
||||||
find_package(catkin REQUIRED COMPONENTS urdfdom urdfdom_headers urdf_parser_plugin pluginlib rosconsole_bridge roscpp)
|
find_package(urdfdom REQUIRED)
|
||||||
|
find_package(catkin REQUIRED COMPONENTS urdfdom_headers urdf_parser_plugin pluginlib rosconsole_bridge roscpp)
|
||||||
|
|
||||||
catkin_package(
|
catkin_package(
|
||||||
LIBRARIES ${PROJECT_NAME}
|
LIBRARIES ${PROJECT_NAME}
|
||||||
|
@ -16,13 +17,13 @@ link_directories(${Boost_LIBRARY_DIRS})
|
||||||
|
|
||||||
include_directories(include)
|
include_directories(include)
|
||||||
|
|
||||||
include_directories(${catkin_INCLUDE_DIRS})
|
include_directories(${catkin_INCLUDE_DIRS} ${urdfdom_INCLUDE_DIRS})
|
||||||
link_directories(${catkin_LIBRARY_DIRS})
|
link_directories(${catkin_LIBRARY_DIRS})
|
||||||
|
|
||||||
find_library(TINYXML tinyxml)
|
find_library(TINYXML tinyxml)
|
||||||
|
|
||||||
add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp)
|
add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp)
|
||||||
target_link_libraries(${PROJECT_NAME} ${TINYXML} ${catkin_LIBRARIES})
|
target_link_libraries(${PROJECT_NAME} ${TINYXML} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES})
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
|
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
|
||||||
|
|
Loading…
Reference in New Issue