kopia lustrzana https://github.com/f4exb/sdrangel
ATV modulator: corrected OpenCV dependencies and removed ugly hack
rodzic
8ae26ada10
commit
cde8b87985
|
@ -305,7 +305,7 @@ find_package(PkgConfig REQUIRED)
|
||||||
find_package(Boost REQUIRED)
|
find_package(Boost REQUIRED)
|
||||||
find_package(FFTW3F REQUIRED)
|
find_package(FFTW3F REQUIRED)
|
||||||
find_package(LibUSB REQUIRED) # used by so many packages
|
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
|
# unfortunately OpenCV library from windows doesn't set the cache option
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
|
|
@ -50,7 +50,7 @@ target_link_libraries(${TARGET_NAME}
|
||||||
sdrbase
|
sdrbase
|
||||||
${TARGET_LIB_GUI}
|
${TARGET_LIB_GUI}
|
||||||
swagger
|
swagger
|
||||||
"${OpenCV_LIBS};opencv_videoio"
|
"${OpenCV_LIBS}"
|
||||||
)
|
)
|
||||||
|
|
||||||
install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
|
install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
|
||||||
|
|
Ładowanie…
Reference in New Issue