Skip to content
Snippets Groups Projects
Commit 59b67708 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[wip/{py-,}sot-torque-control] Add patch-aa

To fix qpOASES detection
parent 452fceb5
No related branches found
No related tags found
No related merge requests found
...@@ -11,6 +11,8 @@ COMMENT= Torque control for humanoids (python bindings) ...@@ -11,6 +11,8 @@ COMMENT= Torque control for humanoids (python bindings)
LICENSE= 2-clause-bsd LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr MAINTAINER= gepetto-soft@laas.fr
CMAKE_ARGS+= -DqpOASES_PREFIX=${PREFIX.qpoases}
USE_PYTHON_ONLY= true USE_PYTHON_ONLY= true
include ../../${CATEGORIES}/${NAME}/depend.mk include ../../${CATEGORIES}/${NAME}/depend.mk
...@@ -23,6 +25,7 @@ include ../../mapping/octomap/depend.mk ...@@ -23,6 +25,7 @@ include ../../mapping/octomap/depend.mk
include ../../math/eigen3/depend.mk include ../../math/eigen3/depend.mk
include ../../math/pinocchio/depend.mk include ../../math/pinocchio/depend.mk
include ../../math/py-pinocchio/depend.mk include ../../math/py-pinocchio/depend.mk
include ../../optimization/qpoases/depend.mk
include ../../path/hpp-fcl/depend.mk include ../../path/hpp-fcl/depend.mk
include ../../pkgtools/pkg-config/depend.mk include ../../pkgtools/pkg-config/depend.mk
include ../../wip/dynamic-graph-v3/depend.mk include ../../wip/dynamic-graph-v3/depend.mk
......
SHA1 (sot-torque-control-1.5.0.tar.gz) = 814e4b4804af6a983169c33d05ad5c195277940f SHA1 (sot-torque-control-1.5.0.tar.gz) = 814e4b4804af6a983169c33d05ad5c195277940f
RMD160 (sot-torque-control-1.5.0.tar.gz) = c24ad9e0b94b37a35feb847dc13fa5e2d86d8638 RMD160 (sot-torque-control-1.5.0.tar.gz) = c24ad9e0b94b37a35feb847dc13fa5e2d86d8638
Size (sot-torque-control-1.5.0.tar.gz) = 2000390 bytes Size (sot-torque-control-1.5.0.tar.gz) = 2000390 bytes
SHA1 (patch-aa) = fdcf7a71bb3f0da8c9fb6ae79d2175057d084eca
--- cmake/find-external/qpOASES/FindqpOASES.cmake.orig 2019-11-25 14:33:39.000000000 +0100
+++ cmake/find-external/qpOASES/FindqpOASES.cmake 2019-11-26 18:13:48.117466759 +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}
+ NAMES qpOASES
+ PATHS ${qpOASES_PREFIX} ${qpOASES_PREFIX}/lib
)
SET(qpOASES_LIBRARIES ${qpOASES_LIBRARY})
...@@ -12,6 +12,7 @@ LICENSE= 2-clause-bsd ...@@ -12,6 +12,7 @@ LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr MAINTAINER= gepetto-soft@laas.fr
CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF
CMAKE_ARGS+= -DqpOASES_PREFIX=${PREFIX.qpoases}
include ../../devel/jrl-cmakemodules/Makefile.common include ../../devel/jrl-cmakemodules/Makefile.common
include ../../devel/boost-headers/depend.mk include ../../devel/boost-headers/depend.mk
...@@ -21,6 +22,7 @@ include ../../graphics/urdfdom/depend.mk ...@@ -21,6 +22,7 @@ include ../../graphics/urdfdom/depend.mk
include ../../mapping/octomap/depend.mk include ../../mapping/octomap/depend.mk
include ../../math/eigen3/depend.mk include ../../math/eigen3/depend.mk
include ../../math/pinocchio/depend.mk include ../../math/pinocchio/depend.mk
include ../../optimization/qpoases/depend.mk
include ../../path/hpp-fcl/depend.mk include ../../path/hpp-fcl/depend.mk
include ../../wip/dynamic-graph-v3/depend.mk include ../../wip/dynamic-graph-v3/depend.mk
include ../../wip/sot-core-v3/depend.mk include ../../wip/sot-core-v3/depend.mk
......
SHA1 (sot-torque-control-1.5.0.tar.gz) = 814e4b4804af6a983169c33d05ad5c195277940f SHA1 (sot-torque-control-1.5.0.tar.gz) = 814e4b4804af6a983169c33d05ad5c195277940f
RMD160 (sot-torque-control-1.5.0.tar.gz) = c24ad9e0b94b37a35feb847dc13fa5e2d86d8638 RMD160 (sot-torque-control-1.5.0.tar.gz) = c24ad9e0b94b37a35feb847dc13fa5e2d86d8638
Size (sot-torque-control-1.5.0.tar.gz) = 2000390 bytes Size (sot-torque-control-1.5.0.tar.gz) = 2000390 bytes
SHA1 (patch-aa) = fdcf7a71bb3f0da8c9fb6ae79d2175057d084eca
--- cmake/find-external/qpOASES/FindqpOASES.cmake.orig 2019-11-25 14:33:39.000000000 +0100
+++ cmake/find-external/qpOASES/FindqpOASES.cmake 2019-11-26 18:13:48.117466759 +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}
+ NAMES qpOASES
+ PATHS ${qpOASES_PREFIX} ${qpOASES_PREFIX}/lib
)
SET(qpOASES_LIBRARIES ${qpOASES_LIBRARY})
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