Commit e74b4673 authored by jcarpent's avatar jcarpent Committed by Joseph Mirabel
Browse files

[CMake] hpp-fcl and assimp must follow Pinocchio dependencies

parent 64c0117d
......@@ -53,18 +53,12 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
SEARCH_FOR_BOOST()
# Search for dependecies.
ADD_REQUIRED_DEPENDENCY("assimp")
ADD_REQUIRED_DEPENDENCY("hpp-util >= 3.2")
ADD_REQUIRED_DEPENDENCY("hpp-fcl >= 0.4.3")
ADD_REQUIRED_DEPENDENCY("pinocchio >= 1.2.4")
ADD_OPTIONAL_DEPENDENCY("romeo_description >= 0.2")
ADD_OPTIONAL_DEPENDENCY("hpp_environments")
ADD_DEFINITIONS(-DWITH_URDFDOM)
ADD_DEFINITIONS(-DWITH_HPP_FCL)
# Set header files.
SET(${PROJECT_NAME}_HEADERS
include/hpp/pinocchio/fwd.hh
......
......@@ -51,9 +51,7 @@ ADD_LIBRARY(${LIBRARY_NAME}
${LIBRARY_SOURCES}
)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} assimp)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-util)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-fcl)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} pinocchio)
INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION lib)
......@@ -43,9 +43,7 @@ MACRO(ADD_TESTCASE NAME GENERATED)
TARGET_LINK_LIBRARIES(${NAME}
${Boost_LIBRARIES}
${PROJECT_NAME})
PKG_CONFIG_USE_DEPENDENCY(${NAME} assimp)
PKG_CONFIG_USE_DEPENDENCY(${NAME} hpp-util)
PKG_CONFIG_USE_DEPENDENCY(${NAME} hpp-fcl)
PKG_CONFIG_USE_DEPENDENCY(${NAME} pinocchio)
ENDMACRO(ADD_TESTCASE)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment