diff --git a/ddp-actuator-solver/Makefile b/ddp-actuator-solver/Makefile index 325030e564170559066b66576f04ccdc75114c3f..c18f45e47e3fd7818c8c3c1b32cfaa4f8cb0c19a 100644 --- a/ddp-actuator-solver/Makefile +++ b/ddp-actuator-solver/Makefile @@ -12,6 +12,7 @@ LICENSE= 2-clause-bsd MAINTAINER= gepetto-soft@laas.fr CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF +CMAKE_ARGS+= -DqpOASES_PREFIX=${PREFIX.qpoases} USE_BOOST_LIBS= unit_test_framework diff --git a/ddp-actuator-solver/distinfo b/ddp-actuator-solver/distinfo index 5dd387ccddceba4a8c763a80df3ae25c0efa1df6..54457f7f5ca980138d595c0ba9906809a1ca9d01 100644 --- a/ddp-actuator-solver/distinfo +++ b/ddp-actuator-solver/distinfo @@ -1,4 +1,4 @@ SHA1 (ddp-actuator-solver-1.0.0.tar.gz) = 18209bbd513a51fd42bdbbe07097b9abd689fade RMD160 (ddp-actuator-solver-1.0.0.tar.gz) = f418d47a0bc4e833c7dacb24ed269809f70e311e Size (ddp-actuator-solver-1.0.0.tar.gz) = 875901 bytes -SHA1 (patch-aa) = 2a507a2f5f46169668f7a32a62ca712e2fa96c25 +SHA1 (patch-aa) = 64661238e6ecaaf8b14afb0db11902cfe098d5eb diff --git a/ddp-actuator-solver/patches/patch-aa b/ddp-actuator-solver/patches/patch-aa index ad00735b9387ec25df4f556f4c18b57faacb6469..f03dd9dd7ad15c6e1d1b56b68b90bce32d0a8929 100644 --- a/ddp-actuator-solver/patches/patch-aa +++ b/ddp-actuator-solver/patches/patch-aa @@ -13,3 +13,19 @@ ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.0.5") +--- cmake/find-external/qpOASES/FindqpOASES.cmake.orig 2019-03-29 11:37:27.000000000 +0100 ++++ cmake/find-external/qpOASES/FindqpOASES.cmake 2019-12-02 18:27:09.903628419 +0100 +@@ -27,11 +27,11 @@ + + FIND_PATH(qpOASES_INCLUDE_DIR + NAMES qpOASES.hpp +- PATHS ${qpOASES_PREFIX} ++ PATHS ${qpOASES_PREFIX} ${qpOASES_PREFIX}/include + ) + FIND_LIBRARY(qpOASES_LIBRARY + NAMES libqpOASES.so +- PATHS ${qpOASES_PREFIX} ++ PATHS ${qpOASES_PREFIX} ${qpOASES_PREFIX}/lib + ) + + SET(qpOASES_LIBRARIES ${qpOASES_LIBRARY})