From f9c8ec020ff83b80f9e5281da57887c779fc7450 Mon Sep 17 00:00:00 2001
From: mnaveau <maximilien.naveau@laas.fr>
Date: Thu, 19 May 2016 16:25:45 +0200
Subject: [PATCH] update the version of the simple humnaoid description folder,
add the qpoases dependency in travis
---
tests/CMakeLists.txt | 2 +-
travis_custom/custom_before_install | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d60aad44..ef653fb1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/private_cmake/config_private.hh.cmake
${CMAKE_BINARY_DIR}/include/${HEADER_DIR}/config_private.hh)
-ADD_REQUIRED_DEPENDENCY("simple_humanoid_description >= 1.0.0")
+ADD_REQUIRED_DEPENDENCY("simple_humanoid_description >= 1.0.1")
ADD_OPTIONAL_DEPENDENCY("hrp2_14_description >= 1.0.2")
#################
diff --git a/travis_custom/custom_before_install b/travis_custom/custom_before_install
index 0f1dd51f..0cebe21b 100755
--- a/travis_custom/custom_before_install
+++ b/travis_custom/custom_before_install
@@ -24,6 +24,7 @@ export GIT_DEPENDENCIES=$GIT_DEPENDENCIES" https://github.com/MaximilienNaveau/s
export GIT_DEPENDENCIES=$GIT_DEPENDENCIES" https://github.com/stack-of-tasks/pinocchio.git#devel"
export GIT_DEPENDENCIES=$GIT_DEPENDENCIES" https://github.com/jrl-umi3218/jrl-mathtools.git"
export GIT_DEPENDENCIES=$GIT_DEPENDENCIES" https://github.com/jrl-umi3218/jrl-mal.git"
+export GIT_DEPENDENCIES=$GIT_DEPENDENCIES" https://github.com/humanoid-path-planner/qpOASES.git"
export CMAKE_ADDITIONAL_OPTIONS=$CMAKE_ADDITIONAL_OPTIONS" -DLINEAR_ALGEBRA_LIB=eigen"
export CMAKE_ADDITIONAL_OPTIONS=$CMAKE_ADDITIONAL_OPTIONS" -DBUILD_UNIT_TESTS=OFF"
--
GitLab