From fa5295980782796633130cf1e09305a6a9aada49 Mon Sep 17 00:00:00 2001
From: pFernbach <pierre.fernbach@gmail.com>
Date: Wed, 15 Jan 2020 10:58:03 +0100
Subject: [PATCH] [CMakeList] replace hpp-spline with curves
---
CMakeLists.txt | 2 +-
python/CMakeLists.txt | 1 +
src/CMakeLists.txt | 1 +
tests/CMakeLists.txt | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97cd81b..6001218 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/find-external/CDD")
ADD_REQUIRED_DEPENDENCY(eigen3)
ADD_REQUIRED_DEPENDENCY(hpp-centroidal-dynamics)
-ADD_REQUIRED_DEPENDENCY(hpp-spline)
+ADD_REQUIRED_DEPENDENCY("curves >= 0.3")
FIND_PACKAGE(CDD REQUIRED)
INCLUDE_DIRECTORIES(${CDD_INCLUDE_DIRS})
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 0172d36..52bc594 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -14,6 +14,7 @@ IF(APPLE)
ENDIF(APPLE)
PKG_CONFIG_USE_DEPENDENCY(${PY_NAME} eigenpy)
PKG_CONFIG_USE_DEPENDENCY(${PY_NAME} hpp-centroidal-dynamics)
+PKG_CONFIG_USE_DEPENDENCY(${PY_NAME} curves)
TARGET_LINK_LIBRARIES(${PY_NAME} hpp-centroidal-dynamics)
INSTALL(
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 905ea90..bfb7bf5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,5 +24,6 @@ if (USE_GLPK)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${glpk_LIBRARY})
endif(USE_GLPK)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-centroidal-dynamics)
+PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} curves)
INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION lib)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 10ca0cd..8c7460f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,6 +8,7 @@ SET(${PROJECT_NAME}_TESTS
FOREACH(test ${${PROJECT_NAME}_TESTS})
ADD_UNIT_TEST("${test}" "test-${test}")
PKG_CONFIG_USE_DEPENDENCY(${test} hpp-centroidal-dynamics)
+ PKG_CONFIG_USE_DEPENDENCY(${test} curves)
PKG_CONFIG_USE_DEPENDENCY(${test} eigen3)
TARGET_LINK_LIBRARIES(${test} ${Boost_LIBRARIES} ${PROJECT_NAME} hpp-centroidal-dynamics)
ENDFOREACH(test)
--
GitLab