Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hpp-centroidal-dynamics
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
Humanoid Path Planner
hpp-centroidal-dynamics
Commits
a7e4cab5
Commit
a7e4cab5
authored
6 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] fix qpOASES detection
parent
16b2f000
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+6
-2
6 additions, 2 deletions
CMakeLists.txt
cmake2/FindqpOASES.cmake
+0
-53
0 additions, 53 deletions
cmake2/FindqpOASES.cmake
src/CMakeLists.txt
+1
-2
1 addition, 2 deletions
src/CMakeLists.txt
test/CMakeLists.txt
+1
-2
1 addition, 2 deletions
test/CMakeLists.txt
with
8 additions
and
59 deletions
CMakeLists.txt
+
6
−
2
View file @
a7e4cab5
...
...
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.6)
INCLUDE
(
cmake/base.cmake
)
INCLUDE
(
cmake/test.cmake
)
INCLUDE
(
cmake/python.cmake
)
INCLUDE
(
cmake2/FindqpOASES.cmake
)
SET
(
PROJECT_ORG stonneau
)
SET
(
PROJECT_NAME hpp-centroidal-dynamics
)
...
...
@@ -51,7 +50,12 @@ else()
endif
()
#SEARCH_FOR_QPOASES()
ADD_REQUIRED_DEPENDENCY
(
"qpOASES"
)
#ADD_REQUIRED_DEPENDENCY("qpOASES")
SET
(
QPOASES_PREFIX
${
CMAKE_PREFIX_PATH
}
CACHE PATH
"Set the prefix where qpOASES is installed"
)
FIND_LIBRARY
(
QPOASES_LIBRARY
"qpOASES"
PATHS
${
QPOASES_PREFIX
}
PATH_SUFFIXES lib
)
FIND_PATH
(
QPOASES_INCLUDE_DIRS NAMES
"qpOASES.hpp"
PATHS
${
QPOASES_PREFIX
}
PATH_SUFFIXES include
)
INCLUDE_DIRECTORIES
(
${
QPOASES_INCLUDE_DIRS
}
)
ADD_SUBDIRECTORY
(
include/
${
CUSTOM_HEADER_DIR
}
)
add_subdirectory
(
src
)
...
...
This diff is collapsed.
Click to expand it.
cmake2/FindqpOASES.cmake
deleted
100644 → 0
+
0
−
53
View file @
16b2f000
#.rst:
# FindqpOASES
# -----------
#
# Try to find the qpOASES library.
# Once done this will define the following variables::
#
# qpOASES_FOUND - System has qpOASES
# qpOASES_INCLUDE_DIR - qpOASES include directory
# qpOASES_LIBRARY - qpOASES libraries
#
# qpOASES does not have an "install" step, and the includes are in the source
# tree, while the libraries are in the build tree.
# Therefore the environment and cmake variables `qpOASES_SOURCE_DIR` and
# `qpOASES_BINARY_DIR` will be used to locate the includes and libraries.
#=============================================================================
# Copyright 2014 iCub Facility, Istituto Italiano di Tecnologia
# Authors: Daniele E. Domenichelli <daniele.domenichelli@iit.it>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of YCM, substitute the full
# License text for the above reference.)
MACRO
(
SEARCH_FOR_QPOASES
)
include
(
FindPackageHandleStandardArgs
)
find_path
(
qpOASES_INCLUDEDIR
NAMES qpOASES.hpp
HINTS
"
${
qpOASES_SOURCE_DIR
}
"
ENV qpOASES_SOURCE_DIR
PATH_SUFFIXES include
)
find_library
(
qpOASES_LIB
NAMES qpOASES
HINTS
"
${
qpOASES_BINARY_DIR
}
"
ENV qpOASES_BINARY_DIR
PATH_SUFFIXES lib
libs
)
set
(
qpOASES_INCLUDE_DIR
${
qpOASES_INCLUDEDIR
}
)
set
(
qpOASES_LIBRARY
${
qpOASES_LIB
}
)
find_package_handle_standard_args
(
qpOASES DEFAULT_MSG qpOASES_LIBRARY
qpOASES_INCLUDE_DIR
)
set
(
qpOASES_FOUND
${
QPOASES_FOUND
}
)
ENDMACRO
(
SEARCH_FOR_QPOASES
)
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
1
−
2
View file @
a7e4cab5
...
...
@@ -19,9 +19,8 @@ SET(${LIBRARY_NAME}_SOURCES
ADD_LIBRARY
(
${
LIBRARY_NAME
}
SHARED
${${
LIBRARY_NAME
}
_SOURCES
}
)
TARGET_LINK_LIBRARIES
(
${
LIBRARY_NAME
}
${
CDD_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
${
LIBRARY_NAME
}
${
CDD_LIBRARIES
}
${
QPOASES_LIBRARY
}
)
PKG_CONFIG_USE_DEPENDENCY
(
${
LIBRARY_NAME
}
eigen3
)
PKG_CONFIG_USE_DEPENDENCY
(
${
LIBRARY_NAME
}
qpOASES
)
if
(
CLP_FOUND
)
TARGET_LINK_LIBRARIES
(
${
LIBRARY_NAME
}
${
CLP_LIBRARIES
}
...
...
This diff is collapsed.
Click to expand it.
test/CMakeLists.txt
+
1
−
2
View file @
a7e4cab5
...
...
@@ -9,6 +9,5 @@ PKG_CONFIG_USE_DEPENDENCY(static-equilibrium eigen3)
TARGET_LINK_LIBRARIES
(
static-equilibrium
${
PROJECT_NAME
}
)
ADD_UNIT_TEST
(
lp-solvers test_LP_solvers
)
PKG_CONFIG_USE_DEPENDENCY
(
lp-solvers qpOASES
)
PKG_CONFIG_USE_DEPENDENCY
(
lp-solvers eigen3
)
TARGET_LINK_LIBRARIES
(
lp-solvers
${
PROJECT_NAME
}
)
TARGET_LINK_LIBRARIES
(
lp-solvers
${
PROJECT_NAME
}
${
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