diff --git a/CMakeLists.txt b/CMakeLists.txt index 863e3c33be1cfb467a496ec5df92d0c669862890..32cb3e2c4237a155abcaf2d40b4fa32f8031b2e4 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 0ac01afb5c088612129815a4868d9cd4a9be57a2..767f1bcdc42880d5facd0ce71c657b290ad49c37 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 b7922e28af352b655a70b09f990fae63e4809a58..a15ab0e3904a1024cf2b11718a87ab144692a52f 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 53c7250a62147017f7bff35c246c27e06e24682c..55b06faa27ede4c2f736fbe85b6e936476377b51 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()