jgrewe/PylonRecorder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove opencv dependency find pylon with cmake function

Browse Source
This commit is contained in:
Jan Grewe 2024-03-08 16:49:35 +01:00
parent b99ff19620
commit 4e617e9505
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -5,7 +5,7 @@ message ("-------------------------------------------")
cmake_minimum_required ( VERSION 3.7 ) cmake_minimum_required ( VERSION 3.7 )
set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake" ) 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 ) configure_file( recorder_config.h.in recorder_config.h )
@ -41,21 +41,21 @@ message ("=> finding nix ...")
find_package (NIX REQUIRED) find_package (NIX REQUIRED)
include_directories (AFTER ${NIX_INCLUDE_DIR}) include_directories (AFTER ${NIX_INCLUDE_DIR})
####################################### # #######################################
# OPENCV # # OPENCV
find_package(OpenCV REQUIRED opencv_highgui opencv_core) # find_package(OpenCV REQUIRED opencv_highgui opencv_core)
include_directories(AFTER ${OpenCV_INCLUDE_DIRS} ) # include_directories(AFTER ${OpenCV_INCLUDE_DIRS} )
set(LINK_LIBS ${LINK_LIBS} ${OpenCV_LIBRARIES}) # set(LINK_LIBS ${LINK_LIBS} ${OpenCV_LIBRARIES})
####################################### #######################################
# Pylon # Pylon
#include_directories ( AFTER "/opt/pylon/include" ) message ("=> finding pylon ...")
#file (GLOB PYLON_LIBRARIES "/opt/pylon/lib/*.so") find_package(pylon 7.1.0 REQUIRED)
include_directories ( AFTER "/opt/pylon/include" )
file (GLOB PYLON_LIBRARIES "/opt/pylon/lib/*.so")
file (GLOB RECORDER_SOURCES *.cpp) file (GLOB RECORDER_SOURCES *.cpp)
file (GLOB RECORDER_INCLUDES *.hpp) file (GLOB RECORDER_INCLUDES *.hpp)
add_executable ( recorder ${RECORDER_SOURCES} ${RECORDER_INCLUDES} ${RECORDER_RES_SOURCES} ) add_executable ( recorder ${RECORDER_SOURCES} ${RECORDER_INCLUDES} ${RECORDER_RES_SOURCES} )
target_include_directories ( recorder PUBLIC "${PROJECT_BINARY_DIR}" ) 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}) target_link_libraries ( recorder Qt5::PrintSupport Qt5::Core Qt5::Widgets Qt5::Gui ${NIX_LIBRARIES} pylon::pylon)
# ${PYLON_LIBRARIES} ${OpenCV_LIBRARIES})

1
writer.h
View File

@ -9,7 +9,6 @@
#include "pylonwrapper.h" #include "pylonwrapper.h"
#include "imagebuffer.h" #include "imagebuffer.h"
#include "projectsettings.h" #include "projectsettings.h"
#include <opencv2/opencv.hpp>
#include "util.h" #include "util.h"
struct VideoSpecs { struct VideoSpecs {