Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
hpp-doc
Commits
87485835
Commit
87485835
authored
Oct 11, 2018
by
Guilhem Saurel
Browse files
use qpOASES from robotpkg
parent
2efa36ad
Pipeline
#1637
failed with stages
in 49 minutes and 28 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.dockers/ubuntu-14.04/Dockerfile
View file @
87485835
...
...
@@ -34,6 +34,7 @@ RUN apt-get update -qqy && apt-get install -qqy \
oxygen-icon-theme
\
python-matplotlib
\
qt4-dev-tools
\
robotpkg-qpoases+doc
\
robotpkg-roboptim-core
\
robotpkg-roboptim-trajectory
\
ros-indigo-xacro
\
...
...
.dockers/ubuntu-14.04/Dockerfile.premade
View file @
87485835
...
...
@@ -5,5 +5,4 @@ ENV DEVEL_DIR /workspace
RUN /auto-install-hpp.sh --branch ubuntu-14.04 --target \
"doxygen-1.8.10.install \
OpenSceneGraph-dae-plugin.install \
qpOASES.install \
eigen3.install"
.dockers/ubuntu-16.04/Dockerfile
View file @
87485835
...
...
@@ -19,6 +19,7 @@ RUN apt-get install -qqy \
libboost-dev
\
liburdfdom-dev
\
libassimp-dev
\
robotpkg-qpoases+doc
\
robotpkg-roboptim-core
\
robotpkg-roboptim-trajectory
\
ros-kinetic-xacro
\
...
...
.dockers/ubuntu-16.04/Dockerfile.premade
View file @
87485835
...
...
@@ -3,4 +3,3 @@ FROM eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:16.04
ENV DEVEL_HPP_DIR /workspace
RUN /auto-install-hpp.sh --branch devel --target OpenSceneGraph-dae-plugin.install
RUN /auto-install-hpp.sh --branch devel --target qpOASES.install
doc/Makefile
View file @
87485835
...
...
@@ -64,9 +64,6 @@ hpp-template-corba_repository=${HPP_REPO}
hpp-corbaserver_branch
=
devel
hpp-corbaserver_repository
=
${HPP_REPO}
qpOASES_branch
=
devel
qpOASES_repository
=
${HPP_REPO}
hpp-constraints_branch
=
devel
hpp-constraints_repository
=
${HPP_REPO}
hpp-constraints_extra_flags
=
-DDISABLE_TESTS
=
ON
...
...
@@ -173,8 +170,6 @@ OpenSceneGraph-3.4.0_extra_flags= -DDESIRED_QT_VERSION=${QT_VERSION} -DCOLLADA_D
collada-dom_extra_flags
=
-DBUILD_SHARED_LIBS
=
TRUE
-DOPT_COLLADA15
=
FALSE
qpOASES_extra_flags
=
-DCMAKE_BUILD_TYPE
=
Release
ifeq
(${HUMANOID}, TRUE)
hpp-manipulation_extra_flags
=
-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP
=
TRUE
hpp-manipulation-corba_extra_flags
=
-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP
=
TRUE
...
...
@@ -214,9 +209,8 @@ hpp-pinocchio.configure.dep: pinocchio.install hpp-util.install \
hpp-statistics.configure.dep
:
hpp-util.install hpp-statistics.checkout
hpp-core.configure.dep
:
hpp-constraints.install hpp-statistics.install
\
hpp-core.checkout
qpOASES.configure.dep
:
qpOASES.checkout
hpp-constraints.configure.dep
:
qpOASES.install
\
hpp-pinocchio.install hpp-statistics.install hpp-constraints.checkout
hpp-constraints.configure.dep
:
hpp-pinocchio.install hpp-statistics.install
\
hpp-constraints.checkout
hpp-wholebody-step.configure.dep
:
hpp-constraints.install hpp-walkgen.install
\
hpp-wholebody-step.checkout
ifeq
(${HUMANOID}, TRUE)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment