diff --git a/README.md b/README.md index 145659ffb0c571db4ddcb72343cf7919d529e742..9b747c16be6cb229123e43fe86b1673445d666b5 100644 --- a/README.md +++ b/README.md @@ -58,11 +58,6 @@ cd $ROBUST_EQUI_LIB_DIR/build cmake -DCMAKE_INSTALL_PREFIX=${DEVEL_DIR}/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 As an alternative to qpOases you can use [CLP](https://projects.coin-or.org/Clp) to solve linear programs. diff --git a/cmake2/FindCDD.cmake b/cmake2/FindCDD.cmake index e05bb31db27b27297e98d66db4c3c41aa64eb47a..2ed4b7795b0abccc56ce1d80a48508fdb9459586 100644 --- a/cmake2/FindCDD.cmake +++ b/cmake2/FindCDD.cmake @@ -10,7 +10,7 @@ find_path(CDD_INCLUDE_DIR cdd/cdd.h HINTS ${CDD_INCLUDEDIR} /usr/include 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 ) set(CDD_LIBRARIES ${CDD_LIBRARY} ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a889a424cb3488e85643e5381a9bd80edc1d09b8..f2181cd8718280f3a82ece0b4a7e6351951de633 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,7 +35,7 @@ if ( MSVC ) SET(CMAKE_DEBUG_POSTFIX d) endif ( MSVC ) -TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${CDD_LIBRARY}) +TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${CDD_LIBRARIES}) PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} qpOASES) if(CLP_FOUND)