From 452fceb5f0649408980ae6068294f242b0fdf88d Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 2 Dec 2019 18:47:11 +0100
Subject: [PATCH] [wip/ddp-actuator-solver] Add patch-aa
to fix qpOASES detection
---
ddp-actuator-solver/Makefile | 1 +
ddp-actuator-solver/distinfo | 2 +-
ddp-actuator-solver/patches/patch-aa | 16 ++++++++++++++++
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/ddp-actuator-solver/Makefile b/ddp-actuator-solver/Makefile
index 325030e5..c18f45e4 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 5dd387cc..54457f7f 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 ad00735b..f03dd9dd 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})
--
GitLab