Skip to content
Snippets Groups Projects
Commit d71738cc authored by mnaveau's avatar mnaveau
Browse files

Manage properly the packaging of QPOases

parent e6959a52
No related branches found
No related tags found
No related merge requests found
......@@ -21,6 +21,7 @@ INCLUDE(cmake/base.cmake)
INCLUDE(cmake/lapack.cmake)
INCLUDE(cmake/cpack.cmake)
INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/FindqpOASES.cmake)
INCLUDE(cmake_metapod_configure.cmake)
INCLUDE(CMakeDependentOption)
......@@ -54,9 +55,9 @@ ADD_OPTIONAL_DEPENDENCY("metapod >= 1.0.7")
#################################################################
# Search for qpOases
FIND_PACKAGE(qpOASES)
SEARCH_FOR_QPOASES()
IF(${qpOASES_FOUND} STREQUAL "TRUE")
MESSAGE(STATUS "--qpOASES : " ${qpOASES_LIBRARIES} )
MESSAGE(STATUS "--qpOASES : " ${qpOASES_LIBRARIES})
INCLUDE_DIRECTORIES(SYSTEM ${qpOASES_INCLUDE_DIRS})
ENDIF(${qpOASES_FOUND} STREQUAL "TRUE")
......
Subproject commit 370de4f4f8ca6122c7ddc13583a7a9465ccc8ad6
Subproject commit e5b52669621f961014f1e395d99643bdc662883a
......@@ -146,7 +146,6 @@ SET(SOURCES
ZMPRefTrajectoryGeneration/ZMPQPWithConstraint.cpp
ZMPRefTrajectoryGeneration/ZMPConstrainedQPFastFormulation.cpp
ZMPRefTrajectoryGeneration/ZMPVelocityReferencedQP.cpp
ZMPRefTrajectoryGeneration/OrientationsPreview.cpp
ZMPRefTrajectoryGeneration/AnalyticalMorisawaAbstract.cpp
ZMPRefTrajectoryGeneration/AnalyticalMorisawaCompact.cpp
......@@ -154,7 +153,6 @@ SET(SOURCES
ZMPRefTrajectoryGeneration/problem-vel-ref.cpp
ZMPRefTrajectoryGeneration/qp-problem.cpp
ZMPRefTrajectoryGeneration/generator-vel-ref.cpp
ZMPRefTrajectoryGeneration/mpc-trajectory-generation.cpp
ZMPRefTrajectoryGeneration/DynamicFilter.cpp
MultiContactRefTrajectoryGeneration/MultiContactHirukawa.cc
......
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