From 4e617e9505c3721b869251c0a19356ded6314173 Mon Sep 17 00:00:00 2001 From: Jan Grewe Date: Fri, 8 Mar 2024 16:49:35 +0100 Subject: [PATCH] remove opencv dependency find pylon with cmake function --- CMakeLists.txt | 24 ++++++++++++------------ writer.h | 1 - 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da437db..3180efd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ message ("-------------------------------------------") cmake_minimum_required ( VERSION 3.7 ) set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake" ) -project( recorder VERSION 0.1.0 LANGUAGES CXX ) +project( recorder VERSION 0.2.0 LANGUAGES CXX ) configure_file( recorder_config.h.in recorder_config.h ) @@ -41,21 +41,21 @@ message ("=> finding nix ...") find_package (NIX REQUIRED) include_directories (AFTER ${NIX_INCLUDE_DIR}) -####################################### -# OPENCV -find_package(OpenCV REQUIRED opencv_highgui opencv_core) -include_directories(AFTER ${OpenCV_INCLUDE_DIRS} ) -set(LINK_LIBS ${LINK_LIBS} ${OpenCV_LIBRARIES}) +# ####################################### +# # OPENCV +# find_package(OpenCV REQUIRED opencv_highgui opencv_core) +# include_directories(AFTER ${OpenCV_INCLUDE_DIRS} ) +# set(LINK_LIBS ${LINK_LIBS} ${OpenCV_LIBRARIES}) ####################################### # Pylon -#include_directories ( AFTER "/opt/pylon/include" ) -#file (GLOB PYLON_LIBRARIES "/opt/pylon/lib/*.so") -include_directories ( AFTER "/opt/pylon/include" ) -file (GLOB PYLON_LIBRARIES "/opt/pylon/lib/*.so") +message ("=> finding pylon ...") +find_package(pylon 7.1.0 REQUIRED) + + file (GLOB RECORDER_SOURCES *.cpp) file (GLOB RECORDER_INCLUDES *.hpp) - add_executable ( recorder ${RECORDER_SOURCES} ${RECORDER_INCLUDES} ${RECORDER_RES_SOURCES} ) target_include_directories ( recorder PUBLIC "${PROJECT_BINARY_DIR}" ) -target_link_libraries ( recorder Qt5::PrintSupport Qt5::Core Qt5::Widgets Qt5::Gui ${NIX_LIBRARIES} ${PYLON_LIBRARIES} ${OpenCV_LIBRARIES}) \ No newline at end of file +target_link_libraries ( recorder Qt5::PrintSupport Qt5::Core Qt5::Widgets Qt5::Gui ${NIX_LIBRARIES} pylon::pylon) +# ${PYLON_LIBRARIES} ${OpenCV_LIBRARIES}) \ No newline at end of file diff --git a/writer.h b/writer.h index 83153ee..5765f68 100644 --- a/writer.h +++ b/writer.h @@ -9,7 +9,6 @@ #include "pylonwrapper.h" #include "imagebuffer.h" #include "projectsettings.h" -#include #include "util.h" struct VideoSpecs {