Skip to content

Commit 4f97f33

Browse files
Fix #76 as far as the tests are concerned.
1 parent 0235eae commit 4f97f33

13 files changed

+38
-2578
lines changed

CMakeLists.txt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ IF(EIGEN_NO_AUTOMATIC_RESIZING)
7070
ENDIF(EIGEN_NO_AUTOMATIC_RESIZING)
7171

7272
# Project dependencies
73-
ADD_PROJECT_DEPENDENCY(pinocchio 2.3.1 REQUIRED PKG_CONFIG_REQUIRES "pinocchio >= 2.3.1")
73+
ADD_PROJECT_DEPENDENCY(pinocchio 2.3.1 REQUIRED
74+
PKG_CONFIG_REQUIRES "pinocchio >= 2.3.1")
75+
ADD_PROJECT_DEPENDENCY(eiquadprog 1.1.3 REQUIRED
76+
PKG_CONFIG_REQUIRES "eiquaprog >= 1.1.3")
7477

7578
SET(BOOST_COMPONENTS filesystem system unit_test_framework)
7679

@@ -125,10 +128,6 @@ SET(${PROJECT_NAME}_TRAJECTORIES_HEADERS
125128
)
126129

127130
SET(${PROJECT_NAME}_SOLVERS_HEADERS
128-
include/tsid/solvers/eiquadprog_2011.hpp
129-
include/tsid/solvers/eiquadprog-rt.hpp
130-
include/tsid/solvers/eiquadprog-rt.hxx
131-
include/tsid/solvers/eiquadprog-fast.hpp
132131
include/tsid/solvers/fwd.hpp
133132
include/tsid/solvers/utils.hpp
134133
include/tsid/solvers/solver-HQP-output.hpp
@@ -216,7 +215,6 @@ SET(${PROJECT_NAME}_TRAJECTORIES_SOURCES
216215
)
217216

218217
SET(${PROJECT_NAME}_SOLVERS_SOURCES
219-
src/solvers/eiquadprog-fast.cpp
220218
src/solvers/solver-HQP-base.cpp
221219
src/solvers/solver-HQP-factory.cpp
222220
src/solvers/solver-HQP-eiquadprog.cpp
@@ -253,7 +251,7 @@ ADD_LIBRARY(${PROJECT_NAME} SHARED
253251
${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
254252
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
255253
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${Boost_LIBRARIES}
256-
pinocchio::pinocchio)
254+
pinocchio::pinocchio eiquadprog::eiquadprog)
257255

258256

259257
IF(SUFFIX_SO_VERSION)

include/tsid/solvers/eiquadprog-fast.hpp

Lines changed: 0 additions & 261 deletions
This file was deleted.

0 commit comments

Comments
 (0)