From cea5a27d56596f1e2a9f88bb5a6a9ef60fbc7e04 Mon Sep 17 00:00:00 2001 From: asantamaria <asantamaria@iri.upc.edu> Date: Thu, 28 Apr 2016 13:26:31 -0400 Subject: [PATCH] Moved to Eigen3 --- src/CMakeLists.txt | 6 +++--- src/quadarm_task_priority_ctrl.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a814ff5..6802e02 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,18 +20,18 @@ set(Boost_USE_STATIC_RUNTIME OFF) FIND_PACKAGE(Boost REQUIRED) # Eigen ####### -FIND_PACKAGE(Eigen REQUIRED) +FIND_PACKAGE(Eigen3 REQUIRED) SET(CMAKE_BUILD_TYPE release) # add the necessary include directories -INCLUDE_DIRECTORIES(. ${EIGEN_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(. ${EIGEN3_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) # create the shared library ADD_LIBRARY(quadarm_task_priority_ctrl SHARED ${sources}) #TARGET_LINK_LIBRARIES(quadarm_task_priority_ctrl ${EIGEN_LIBRARY} ${Boost_LIBRARIES} orocos-kdl) -TARGET_LINK_LIBRARIES(quadarm_task_priority_ctrl ${EIGEN_LIBRARY} ${Boost_LIBRARIES}) +TARGET_LINK_LIBRARIES(quadarm_task_priority_ctrl ${EIGEN3_LIBRARY} ${Boost_LIBRARIES}) # link necessary libraries diff --git a/src/quadarm_task_priority_ctrl.h b/src/quadarm_task_priority_ctrl.h index fce566c..7e6928b 100644 --- a/src/quadarm_task_priority_ctrl.h +++ b/src/quadarm_task_priority_ctrl.h @@ -9,9 +9,9 @@ #include <sstream> #include <pwd.h> #include <math.h> -#include <Eigen/Dense> -#include <Eigen/Eigenvalues> -#include <Eigen/SVD> +#include <eigen3/Eigen/Dense> +#include <eigen3/Eigen/Eigenvalues> +#include <eigen3/Eigen/SVD> #include <sys/stat.h> -- GitLab