Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
jrl-walkgen
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Guilhem Saurel
jrl-walkgen
Commits
d71738cc
Commit
d71738cc
authored
9 years ago
by
mnaveau
Browse files
Options
Downloads
Patches
Plain Diff
Manage properly the packaging of QPOases
parent
e6959a52
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+3
-2
3 additions, 2 deletions
CMakeLists.txt
cmake
+1
-1
1 addition, 1 deletion
cmake
src/CMakeLists.txt
+0
-2
0 additions, 2 deletions
src/CMakeLists.txt
with
4 additions
and
5 deletions
CMakeLists.txt
+
3
−
2
View file @
d71738cc
...
...
@@ -21,6 +21,7 @@ INCLUDE(cmake/base.cmake)
INCLUDE
(
cmake/lapack.cmake
)
INCLUDE
(
cmake/cpack.cmake
)
INCLUDE
(
cmake/boost.cmake
)
INCLUDE
(
cmake/FindqpOASES.cmake
)
INCLUDE
(
cmake_metapod_configure.cmake
)
INCLUDE
(
CMakeDependentOption
)
...
...
@@ -54,9 +55,9 @@ ADD_OPTIONAL_DEPENDENCY("metapod >= 1.0.7")
#################################################################
# Search for qpOases
FIND_PACKAGE
(
qp
OASES
)
SEARCH_FOR_QP
OASES
(
)
IF
(
${
qpOASES_FOUND
}
STREQUAL
"TRUE"
)
MESSAGE
(
STATUS
"--qpOASES : "
${
qpOASES_LIBRARIES
}
)
MESSAGE
(
STATUS
"--qpOASES : "
${
qpOASES_LIBRARIES
}
)
INCLUDE_DIRECTORIES
(
SYSTEM
${
qpOASES_INCLUDE_DIRS
}
)
ENDIF
(
${
qpOASES_FOUND
}
STREQUAL
"TRUE"
)
...
...
This diff is collapsed.
Click to expand it.
cmake
@
e5b52669
Compare
370de4f4
...
e5b52669
Subproject commit
370de4f4f8ca6122c7ddc13583a7a9465ccc8ad6
Subproject commit
e5b52669621f961014f1e395d99643bdc662883a
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
0
−
2
View file @
d71738cc
...
...
@@ -146,7 +146,6 @@ SET(SOURCES
ZMPRefTrajectoryGeneration/ZMPQPWithConstraint.cpp
ZMPRefTrajectoryGeneration/ZMPConstrainedQPFastFormulation.cpp
ZMPRefTrajectoryGeneration/ZMPVelocityReferencedQP.cpp
ZMPRefTrajectoryGeneration/OrientationsPreview.cpp
ZMPRefTrajectoryGeneration/AnalyticalMorisawaAbstract.cpp
ZMPRefTrajectoryGeneration/AnalyticalMorisawaCompact.cpp
...
...
@@ -154,7 +153,6 @@ SET(SOURCES
ZMPRefTrajectoryGeneration/problem-vel-ref.cpp
ZMPRefTrajectoryGeneration/qp-problem.cpp
ZMPRefTrajectoryGeneration/generator-vel-ref.cpp
ZMPRefTrajectoryGeneration/mpc-trajectory-generation.cpp
ZMPRefTrajectoryGeneration/DynamicFilter.cpp
MultiContactRefTrajectoryGeneration/MultiContactHirukawa.cc
...
...
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