Skip to content
Snippets Groups Projects
Commit fa529598 authored by Pierre Fernbach's avatar Pierre Fernbach
Browse files

[CMakeList] replace hpp-spline with curves

parent 9a9b119d
No related branches found
No related tags found
No related merge requests found
...@@ -38,7 +38,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/find-external/CDD") ...@@ -38,7 +38,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/find-external/CDD")
ADD_REQUIRED_DEPENDENCY(eigen3) ADD_REQUIRED_DEPENDENCY(eigen3)
ADD_REQUIRED_DEPENDENCY(hpp-centroidal-dynamics) ADD_REQUIRED_DEPENDENCY(hpp-centroidal-dynamics)
ADD_REQUIRED_DEPENDENCY(hpp-spline) ADD_REQUIRED_DEPENDENCY("curves >= 0.3")
FIND_PACKAGE(CDD REQUIRED) FIND_PACKAGE(CDD REQUIRED)
INCLUDE_DIRECTORIES(${CDD_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${CDD_INCLUDE_DIRS})
......
...@@ -14,6 +14,7 @@ IF(APPLE) ...@@ -14,6 +14,7 @@ IF(APPLE)
ENDIF(APPLE) ENDIF(APPLE)
PKG_CONFIG_USE_DEPENDENCY(${PY_NAME} eigenpy) PKG_CONFIG_USE_DEPENDENCY(${PY_NAME} eigenpy)
PKG_CONFIG_USE_DEPENDENCY(${PY_NAME} hpp-centroidal-dynamics) PKG_CONFIG_USE_DEPENDENCY(${PY_NAME} hpp-centroidal-dynamics)
PKG_CONFIG_USE_DEPENDENCY(${PY_NAME} curves)
TARGET_LINK_LIBRARIES(${PY_NAME} hpp-centroidal-dynamics) TARGET_LINK_LIBRARIES(${PY_NAME} hpp-centroidal-dynamics)
INSTALL( INSTALL(
......
...@@ -24,5 +24,6 @@ if (USE_GLPK) ...@@ -24,5 +24,6 @@ if (USE_GLPK)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${glpk_LIBRARY}) TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${glpk_LIBRARY})
endif(USE_GLPK) endif(USE_GLPK)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-centroidal-dynamics) PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-centroidal-dynamics)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} curves)
INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION lib) INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION lib)
...@@ -8,6 +8,7 @@ SET(${PROJECT_NAME}_TESTS ...@@ -8,6 +8,7 @@ SET(${PROJECT_NAME}_TESTS
FOREACH(test ${${PROJECT_NAME}_TESTS}) FOREACH(test ${${PROJECT_NAME}_TESTS})
ADD_UNIT_TEST("${test}" "test-${test}") ADD_UNIT_TEST("${test}" "test-${test}")
PKG_CONFIG_USE_DEPENDENCY(${test} hpp-centroidal-dynamics) PKG_CONFIG_USE_DEPENDENCY(${test} hpp-centroidal-dynamics)
PKG_CONFIG_USE_DEPENDENCY(${test} curves)
PKG_CONFIG_USE_DEPENDENCY(${test} eigen3) PKG_CONFIG_USE_DEPENDENCY(${test} eigen3)
TARGET_LINK_LIBRARIES(${test} ${Boost_LIBRARIES} ${PROJECT_NAME} hpp-centroidal-dynamics) TARGET_LINK_LIBRARIES(${test} ${Boost_LIBRARIES} ${PROJECT_NAME} hpp-centroidal-dynamics)
ENDFOREACH(test) ENDFOREACH(test)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment