Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gepetto
robotpkg-wip
Commits
452fceb5
Commit
452fceb5
authored
5 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
[wip/ddp-actuator-solver] Add patch-aa
to fix qpOASES detection
parent
866ca824
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ddp-actuator-solver/Makefile
+1
-0
1 addition, 0 deletions
ddp-actuator-solver/Makefile
ddp-actuator-solver/distinfo
+1
-1
1 addition, 1 deletion
ddp-actuator-solver/distinfo
ddp-actuator-solver/patches/patch-aa
+16
-0
16 additions, 0 deletions
ddp-actuator-solver/patches/patch-aa
with
18 additions
and
1 deletion
ddp-actuator-solver/Makefile
+
1
−
0
View file @
452fceb5
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
ddp-actuator-solver/distinfo
+
1
−
1
View file @
452fceb5
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
This diff is collapsed.
Click to expand it.
ddp-actuator-solver/patches/patch-aa
+
16
−
0
View file @
452fceb5
...
...
@@ -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})
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment