Skip to content
Snippets Groups Projects
Commit 2ded1c0a authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Andrea Del Prete
Browse files

Fix FindCDD.cmake (#3)

* Fix FindCDD.cmake

* Update README.md
parent 25f4c0e7
No related branches found
No related tags found
No related merge requests found
...@@ -58,11 +58,6 @@ cd $ROBUST_EQUI_LIB_DIR/build ...@@ -58,11 +58,6 @@ cd $ROBUST_EQUI_LIB_DIR/build
cmake -DCMAKE_INSTALL_PREFIX=${DEVEL_DIR}/install .. cmake -DCMAKE_INSTALL_PREFIX=${DEVEL_DIR}/install ..
make install make install
``` ```
Currently, CMake may have problems finding CDD.
If this is the case you can specify its path manually, for instance:
```
cmake -DCDD_LIBRARY=/usr/lib/libcdd.so -DCMAKE_INSTALL_PREFIX=${DEVEL_DIR}/install ..
```
### Optional ### Optional
As an alternative to qpOases you can use [CLP](https://projects.coin-or.org/Clp) to solve linear programs. As an alternative to qpOases you can use [CLP](https://projects.coin-or.org/Clp) to solve linear programs.
......
...@@ -10,7 +10,7 @@ find_path(CDD_INCLUDE_DIR cdd/cdd.h ...@@ -10,7 +10,7 @@ find_path(CDD_INCLUDE_DIR cdd/cdd.h
HINTS ${CDD_INCLUDEDIR} /usr/include HINTS ${CDD_INCLUDEDIR} /usr/include
PATH_SUFFIXES CDD ) PATH_SUFFIXES CDD )
find_library(CDD_LIBRARY NAMES libcdd find_library(CDD_LIBRARY NAMES libcdd.so
HINTS ${CDD_LIBDIR} ${CDD_LIBRARY_DIRS} /usr/lib/libcdd.so ) HINTS ${CDD_LIBDIR} ${CDD_LIBRARY_DIRS} /usr/lib/libcdd.so )
set(CDD_LIBRARIES ${CDD_LIBRARY} ) set(CDD_LIBRARIES ${CDD_LIBRARY} )
......
...@@ -35,7 +35,7 @@ if ( MSVC ) ...@@ -35,7 +35,7 @@ if ( MSVC )
SET(CMAKE_DEBUG_POSTFIX d) SET(CMAKE_DEBUG_POSTFIX d)
endif ( MSVC ) endif ( MSVC )
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${CDD_LIBRARY}) TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${CDD_LIBRARIES})
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} qpOASES) PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} qpOASES)
if(CLP_FOUND) if(CLP_FOUND)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment