Added find_package of roscpp in collada_parser
This commit is contained in:
parent
20b127c2b4
commit
55717fedbe
|
@ -1,22 +1,17 @@
|
|||
cmake_minimum_required(VERSION 2.8.3)
|
||||
project(collada_parser)
|
||||
|
||||
find_package(Boost REQUIRED system)
|
||||
|
||||
find_package(catkin REQUIRED)
|
||||
|
||||
find_package(catkin REQUIRED COMPONENTS urdfdom_headers)
|
||||
find_package(catkin REQUIRED COMPONENTS urdfdom_headers roscpp)
|
||||
|
||||
catkin_package(
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
INCLUDE_DIRS include
|
||||
CATKIN_DEPENDS urdfdom_headers)
|
||||
CATKIN_DEPENDS urdfdom_headers roscpp)
|
||||
|
||||
include_directories(include)
|
||||
|
||||
find_package(Boost REQUIRED system)
|
||||
include_directories(${Boost_INCLUDE_DIR})
|
||||
|
||||
include_directories(${catkin_INCLUDE_DIRS})
|
||||
include_directories(include ${catkin_INCLUDE_DIRS})
|
||||
|
||||
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake-extensions/)
|
||||
find_package(PkgConfig)
|
||||
|
@ -26,7 +21,8 @@ if( COLLADA_DOM_FOUND )
|
|||
link_directories(${COLLADA_DOM_LIBRARY_DIRS})
|
||||
endif()
|
||||
|
||||
# necessary for collada reader to create the temporary dae files due to limitations in the URDF geometry
|
||||
# necessary for collada reader to create the temporary dae files due
|
||||
# to limitations in the URDF geometry
|
||||
include (CheckFunctionExists)
|
||||
check_function_exists(mkstemps HAVE_MKSTEMPS)
|
||||
if(HAVE_MKSTEMPS)
|
||||
|
@ -35,13 +31,22 @@ endif()
|
|||
|
||||
#common commands for building c++ executables and libraries
|
||||
add_library(${PROJECT_NAME} src/collada_parser.cpp)
|
||||
target_link_libraries(${PROJECT_NAME} ${COLLADA_DOM_LIBRARIES} ${Boost_LIBRARIES})
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
${COLLADA_DOM_LIBRARIES} ${Boost_LIBRARIES} ${catkin_LIBRARIES}
|
||||
)
|
||||
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILER_FLAGS "${COLLADA_DOM_CFLAGS_OTHER}")
|
||||
set_target_properties(${PROJECT_NAME}
|
||||
PROPERTIES COMPILER_FLAGS "${COLLADA_DOM_CFLAGS_OTHER}"
|
||||
)
|
||||
if(APPLE)
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "${COLLADA_DOM_LDFLAGS_OTHER} -undefined dynamic_lookup")
|
||||
set_target_properties(${PROJECT_NAME}
|
||||
PROPERTIES LINK_FLAGS
|
||||
"${COLLADA_DOM_LDFLAGS_OTHER} -undefined dynamic_lookup"
|
||||
)
|
||||
else()
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "${COLLADA_DOM_LDFLAGS_OTHER}")
|
||||
set_target_properties(${PROJECT_NAME}
|
||||
PROPERTIES LINK_FLAGS "${COLLADA_DOM_LDFLAGS_OTHER}"
|
||||
)
|
||||
endif()
|
||||
|
||||
install(TARGETS ${PROJECT_NAME}
|
||||
|
|
Loading…
Reference in New Issue