From 3f8036781cb52e771a3b050aa59b3c194347ec35 Mon Sep 17 00:00:00 2001 From: Hongzhuo Liang Date: Mon, 2 Oct 2023 21:30:57 +0200 Subject: [PATCH] bump cmake and fix missing opencv --- .gitignore | 1 + davis_ros_driver/CMakeLists.txt | 5 ++++- dvs_calibration/CMakeLists.txt | 2 +- dvs_calibration_gui/CMakeLists.txt | 2 +- dvs_file_writer/CMakeLists.txt | 2 +- dvs_msgs/CMakeLists.txt | 2 +- dvs_renderer/CMakeLists.txt | 2 +- dvs_ros_driver/CMakeLists.txt | 6 +++++- dvxplorer_ros_driver/CMakeLists.txt | 5 ++++- 9 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 00b4d47..e966934 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea cmake-build-debug/ +.vscode diff --git a/davis_ros_driver/CMakeLists.txt b/davis_ros_driver/CMakeLists.txt index b385a57..c39b44d 100644 --- a/davis_ros_driver/CMakeLists.txt +++ b/davis_ros_driver/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.1.3) project(davis_ros_driver) find_package(catkin_simple REQUIRED) @@ -7,6 +7,7 @@ find_package(libcaer REQUIRED) catkin_simple() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3") +find_package(OpenCV REQUIRED) find_package(Boost REQUIRED COMPONENTS system thread) @@ -25,6 +26,7 @@ cs_add_library(davis_ros_driver_nodelet # link the executable to the necesarry libs target_link_libraries(davis_ros_driver ${catkin_LIBRARIES} + ${OpenCV_LIBRARIES} ${Boost_LIBRARIES} libcaer::caer ) @@ -32,6 +34,7 @@ target_link_libraries(davis_ros_driver # link the executable to the necesarry libs target_link_libraries(davis_ros_driver_nodelet ${catkin_LIBRARIES} + ${OpenCV_LIBRARIES} ${Boost_LIBRARIES} libcaer::caer ) diff --git a/dvs_calibration/CMakeLists.txt b/dvs_calibration/CMakeLists.txt index dd01e4c..dc65c49 100644 --- a/dvs_calibration/CMakeLists.txt +++ b/dvs_calibration/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.1.3) project(dvs_calibration) find_package(catkin_simple REQUIRED) diff --git a/dvs_calibration_gui/CMakeLists.txt b/dvs_calibration_gui/CMakeLists.txt index eeb5b3a..c046be9 100644 --- a/dvs_calibration_gui/CMakeLists.txt +++ b/dvs_calibration_gui/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.1.3) project(dvs_calibration_gui) find_package(catkin REQUIRED COMPONENTS ) diff --git a/dvs_file_writer/CMakeLists.txt b/dvs_file_writer/CMakeLists.txt index f5aec4b..7cad2ed 100644 --- a/dvs_file_writer/CMakeLists.txt +++ b/dvs_file_writer/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.1.3) project(dvs_file_writer) find_package(catkin_simple REQUIRED) diff --git a/dvs_msgs/CMakeLists.txt b/dvs_msgs/CMakeLists.txt index 9fe87f0..39d9d31 100644 --- a/dvs_msgs/CMakeLists.txt +++ b/dvs_msgs/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.1.3) project(dvs_msgs) # search for everything we need to build the messages, dont forget the message_generation diff --git a/dvs_renderer/CMakeLists.txt b/dvs_renderer/CMakeLists.txt index a7db6ce..391e7fd 100644 --- a/dvs_renderer/CMakeLists.txt +++ b/dvs_renderer/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.1.3) project(dvs_renderer) find_package(catkin_simple REQUIRED) diff --git a/dvs_ros_driver/CMakeLists.txt b/dvs_ros_driver/CMakeLists.txt index 23ca4b5..2ee51aa 100644 --- a/dvs_ros_driver/CMakeLists.txt +++ b/dvs_ros_driver/CMakeLists.txt @@ -1,7 +1,9 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.1.3) project(dvs_ros_driver) find_package(catkin_simple REQUIRED) +find_package(OpenCV REQUIRED) + find_package(libcaer REQUIRED) catkin_simple() @@ -26,6 +28,7 @@ cs_add_library(dvs_ros_driver_nodelet target_link_libraries(dvs_ros_driver ${catkin_LIBRARIES} ${Boost_LIBRARIES} + ${OpenCV_LIBRARIES} libcaer::caer ) @@ -33,6 +36,7 @@ target_link_libraries(dvs_ros_driver target_link_libraries(dvs_ros_driver_nodelet ${catkin_LIBRARIES} ${Boost_LIBRARIES} + ${OpenCV_LIBRARIES} libcaer::caer ) diff --git a/dvxplorer_ros_driver/CMakeLists.txt b/dvxplorer_ros_driver/CMakeLists.txt index b50e3a8..09d6017 100644 --- a/dvxplorer_ros_driver/CMakeLists.txt +++ b/dvxplorer_ros_driver/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.1.3) project(dvxplorer_ros_driver) find_package(catkin_simple REQUIRED) @@ -7,6 +7,7 @@ find_package(libcaer REQUIRED) catkin_simple() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3") +find_package(OpenCV REQUIRED) find_package(Boost REQUIRED COMPONENTS system thread) @@ -26,6 +27,7 @@ cs_add_library(dvxplorer_ros_driver_nodelet target_link_libraries(dvxplorer_ros_driver ${catkin_LIBRARIES} ${Boost_LIBRARIES} + ${OpenCV_LIBRARIES} libcaer::caer ) @@ -33,6 +35,7 @@ target_link_libraries(dvxplorer_ros_driver target_link_libraries(dvxplorer_ros_driver_nodelet ${catkin_LIBRARIES} ${Boost_LIBRARIES} + ${OpenCV_LIBRARIES} libcaer::caer )