From 897433bdd4b2fd88d472679de2bcdd2a591a1ddd Mon Sep 17 00:00:00 2001
From: andreadelprete <andre.delprete@gmail.com>
Date: Mon, 2 Nov 2015 15:43:36 +0100
Subject: [PATCH] Fix bug in cmakelist.
---
CMakeLists.txt | 2 +-
include/robust-equilibrium-lib/util.hh | 2 +-
src/CMakeLists.txt | 4 ++--
test/CMakeLists.txt | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 863e3c3..32cb3e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
SETUP_PROJECT()
# Inhibit all warning messages.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
# remove flag that makes all warnings into errors
string (REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
diff --git a/include/robust-equilibrium-lib/util.hh b/include/robust-equilibrium-lib/util.hh
index 0ac01af..767f1bc 100644
--- a/include/robust-equilibrium-lib/util.hh
+++ b/include/robust-equilibrium-lib/util.hh
@@ -39,7 +39,7 @@ typedef Eigen::Matrix <value_type, Eigen::Dynamic, 6, Eigen::RowMajor>
typedef Eigen::Matrix <value_type, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor> MatrixXX;
//define Eigen ref if available
-#if EIGEN_VERSION_AT_LEAST(3,2,0)
+#if EIGEN_VERSION_AT_LEAST(3,2,2)
typedef Eigen::Ref<Vector2> Ref_vector2;
typedef Eigen::Ref<Vector3> Ref_vector3;
typedef Eigen::Ref<VectorX> Ref_vectorX;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b7922e2..a15ab0e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories("${EIGEN3_INCLUDE_DIR}")
include_directories("${CDD_INCLUDE_DIR}")
include_directories("${qpOASES_INCLUDE_DIR}")
-if( DEFINED CLP_FOUND)
+if(CLP_FOUND)
include_directories("${CLP_INCLUDE_DIR}")
endif()
@@ -37,7 +37,7 @@ endif ( MSVC )
TARGET_LINK_LIBRARIES(robust-equilibrium-lib ${CDD_LIBRARY}
${qpOASES_LIBRARY})
-if( DEFINED CLP_FOUND)
+if(CLP_FOUND)
TARGET_LINK_LIBRARIES(robust-equilibrium-lib ${CLP_LIBRARY}
/usr/lib/libCoinUtils.so)
endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 53c7250..55b06fa 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories("${INCLUDE_DIR}")
include_directories("${EIGEN3_INCLUDE_DIR}")
include_directories("${CDD_INCLUDE_DIR}")
include_directories("${qpOASES_INCLUDE_DIR}")
-if(DEFINED CLP_FOUND)
+if(CLP_FOUND)
include_directories("${CLP_INCLUDE_DIR}")
endif()
--
GitLab