From 2ded1c0ab70209b1622b031754326994979b13e4 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <josephmirabel@gmail.com>
Date: Tue, 28 Jun 2016 10:37:36 +0200
Subject: [PATCH] Fix FindCDD.cmake (#3)
* Fix FindCDD.cmake
* Update README.md
---
README.md | 5 -----
cmake2/FindCDD.cmake | 2 +-
src/CMakeLists.txt | 2 +-
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 145659f..9b747c1 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 e05bb31..2ed4b77 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 a889a42..f2181cd 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)
--
GitLab