From cde8b87985d31bc2a4db7d2ffcaf9ec5143915e4 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 1 Jun 2019 01:31:55 +0200 Subject: [PATCH] ATV modulator: corrected OpenCV dependencies and removed ugly hack --- CMakeLists.txt | 2 +- plugins/channeltx/modatv/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b417706e..048282c02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -305,7 +305,7 @@ find_package(PkgConfig REQUIRED) find_package(Boost REQUIRED) find_package(FFTW3F REQUIRED) find_package(LibUSB REQUIRED) # used by so many packages -find_package(OpenCV REQUIRED core highgui imgproc) # channeltx/modatv +find_package(OpenCV REQUIRED core highgui imgproc imgcodecs videoio) # channeltx/modatv # unfortunately OpenCV library from windows doesn't set the cache option if(WIN32) diff --git a/plugins/channeltx/modatv/CMakeLists.txt b/plugins/channeltx/modatv/CMakeLists.txt index 32ca54f0f..c5f5b6635 100644 --- a/plugins/channeltx/modatv/CMakeLists.txt +++ b/plugins/channeltx/modatv/CMakeLists.txt @@ -50,7 +50,7 @@ target_link_libraries(${TARGET_NAME} sdrbase ${TARGET_LIB_GUI} swagger - "${OpenCV_LIBS};opencv_videoio" + "${OpenCV_LIBS}" ) install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})