Commit 010c66ec authored by Paul Beuchat's avatar Paul Beuchat
Browse files

Added Eigen library to CMakeLists.txt It needs to be installed before hand

parent 3bcfdc8b
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 3.0)
project(d_fall_pps) project(d_fall_pps)
## Add support for C++11, supported in ROS Kinetic and newer ## Add support for C++11, supported in ROS Kinetic and newer
...@@ -15,8 +15,9 @@ find_package(catkin REQUIRED COMPONENTS ...@@ -15,8 +15,9 @@ find_package(catkin REQUIRED COMPONENTS
genmsg genmsg
rosbag rosbag
roslib roslib
) )
find_package (Eigen3 3.3 REQUIRED NO_MODULE)
# GUI -- Add precompiler definitions to include ROS things in GUI compilation # GUI -- Add precompiler definitions to include ROS things in GUI compilation
add_definitions(-DCATKIN_MAKE) add_definitions(-DCATKIN_MAKE)
...@@ -34,6 +35,7 @@ find_package(Qt5Core REQUIRED) ...@@ -34,6 +35,7 @@ find_package(Qt5Core REQUIRED)
find_package(Qt5Gui REQUIRED) find_package(Qt5Gui REQUIRED)
find_package(Qt5Svg REQUIRED) find_package(Qt5Svg REQUIRED)
# GUI -- Add src and includes # GUI -- Add src and includes
set(MY_GUI_LIB_PATH_SRC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/src) set(MY_GUI_LIB_PATH_SRC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/src)
set(MY_GUI_LIB_PATH_INC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/include) set(MY_GUI_LIB_PATH_INC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/include)
...@@ -355,7 +357,7 @@ target_link_libraries(PPSClient ${catkin_LIBRARIES}) ...@@ -355,7 +357,7 @@ target_link_libraries(PPSClient ${catkin_LIBRARIES})
target_link_libraries(SafeControllerService ${catkin_LIBRARIES}) target_link_libraries(SafeControllerService ${catkin_LIBRARIES})
target_link_libraries(DemoControllerService ${catkin_LIBRARIES}) target_link_libraries(DemoControllerService ${catkin_LIBRARIES})
target_link_libraries(StudentControllerService ${catkin_LIBRARIES}) target_link_libraries(StudentControllerService ${catkin_LIBRARIES})
target_link_libraries(MpcControllerService ${catkin_LIBRARIES}) target_link_libraries(MpcControllerService ${catkin_LIBRARIES} Eigen3::Eigen)
target_link_libraries(CentralManagerService ${catkin_LIBRARIES}) target_link_libraries(CentralManagerService ${catkin_LIBRARIES})
target_link_libraries(ParameterService ${catkin_LIBRARIES}) target_link_libraries(ParameterService ${catkin_LIBRARIES})
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
#include <std_msgs/Int32.h> #include <std_msgs/Int32.h>
#include <Eigen/Dense>
...@@ -246,7 +246,7 @@ void processFetchedParameters(); ...@@ -246,7 +246,7 @@ void processFetchedParameters();
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// OOO U U TTTTT EEEEE RRRR // OOO U U TTTTT EEEEE RRRR
// O O U U T E R R // O O U U T E R R
// O O U U T EEE RRRR // O O U U T EEE RRRR
// O O U U T E R R // O O U U T E R R
...@@ -403,8 +403,6 @@ bool calculateControlOutput(Controller::Request &request, Controller::Response & ...@@ -403,8 +403,6 @@ bool calculateControlOutput(Controller::Request &request, Controller::Response &
} }
// ********************** // **********************
// Y Y A W W // Y Y A W W
// Y Y A A W W // Y Y A A W W
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment