Browse Source

Merge pull request #3018 from srcejon/dvb

Fix missing OpenCV libraries in Windows installer
chirpmodem-v8.0.0
Edouard Griffiths 1 month ago committed by GitHub
parent
commit
d28b677abd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 3
      CMakeLists.txt
  2. 8
      cmake/cpack/CMakeLists.txt

3
CMakeLists.txt

@ -961,6 +961,9 @@ endif() @@ -961,6 +961,9 @@ endif()
if(WIN32)
find_package(OpenCV OPTIONAL_COMPONENTS core highgui imgproc imgcodecs videoio) # channeltx/modatv
if(OpenCV_LIBS)
list(REMOVE_DUPLICATES OpenCV_LIBS)
endif()
set(OpenCV_INCLUDE_DIRS "${OpenCV_INCLUDE_DIRS}" CACHE INTERNAL "")
set(OpenCV_LIBS "${OpenCV_LIBS}" CACHE INTERNAL "")

8
cmake/cpack/CMakeLists.txt

@ -152,8 +152,8 @@ elseif(WIN32 OR MINGW) @@ -152,8 +152,8 @@ elseif(WIN32 OR MINGW)
)
endforeach(ffmpeg_dll)
# modatv.dll
file(GLOB OPENCV_DLLS "${OpenCV_LIBS_BIN_DIR}/opencv_world*${CMAKE_SHARED_LIBRARY_SUFFIX}")
# modatv.dll and moddatv.dll: opencv DLLs
file(GLOB OPENCV_DLLS "${OpenCV_LIBS_BIN_DIR}/opencv_*${CMAKE_SHARED_LIBRARY_SUFFIX}")
foreach(opencv_dll ${OPENCV_DLLS})
get_filename_component(opencv_dll_name "${opencv_dll}" NAME)
add_custom_target(copy_ffmpeg_${opencv_dll_name} ALL
@ -290,9 +290,9 @@ elseif(WIN32 OR MINGW) @@ -290,9 +290,9 @@ elseif(WIN32 OR MINGW)
# demoddatv.dll
install(DIRECTORY "${FFMPEG_LIBRARIES}/" DESTINATION "${INSTALL_LIB_DIR}"
FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}")
# modatv.dll
# modatv.dll and moddatv.dll
install(DIRECTORY "${OpenCV_LIBS_BIN_DIR}/" DESTINATION "${INSTALL_LIB_DIR}"
FILES_MATCHING PATTERN "opencv_world*${CMAKE_SHARED_LIBRARY_SUFFIX}")
FILES_MATCHING PATTERN "opencv_*${CMAKE_SHARED_LIBRARY_SUFFIX}")
# libusb
get_filename_component(GFN_LIBUSB_DIR "${LIBUSB_LIBRARIES}" DIRECTORY)
install(FILES "${GFN_LIBUSB_DIR}/libusb-1.0${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}")

Loading…
Cancel
Save