Skip to content

O
opencv
Commit 1d2baf0b authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #9094 from ArkadiuszRaj:fix-aravis-dependency

parents 10e6491c 0ef5c8c5
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
cmake/OpenCVFindLibsVideo.cmake
View file @ 1d2baf0b
...@@ -127,6 +127,8 @@ endif(WITH_GIGEAPI) ...@@ -127,6 +127,8 @@ endif(WITH_GIGEAPI)
# --- Aravis SDK --- # --- Aravis SDK ---
ocv_clear_vars(HAVE_ARAVIS_API) ocv_clear_vars(HAVE_ARAVIS_API)
if(WITH_ARAVIS) if(WITH_ARAVIS)
check_module(glib-2.0 HAVE_ARAVIS_GLIB VIDEOIO)
if(HAVE_ARAVIS_GLIB)
find_path(ARAVIS_INCLUDE_PATH "arv.h" find_path(ARAVIS_INCLUDE_PATH "arv.h"
PATHS /usr/local /var /opt /usr ENV ProgramFiles ENV ProgramW6432 PATHS /usr/local /var /opt /usr ENV ProgramFiles ENV ProgramW6432
PATH_SUFFIXES include "aravis-0.6" "aravis-0.4" PATH_SUFFIXES include "aravis-0.6" "aravis-0.4"
...@@ -135,6 +137,9 @@ if(WITH_ARAVIS) ...@@ -135,6 +137,9 @@ if(WITH_ARAVIS)
if(ARAVIS_LIBRARIES AND ARAVIS_INCLUDE_PATH) if(ARAVIS_LIBRARIES AND ARAVIS_INCLUDE_PATH)
set(HAVE_ARAVIS_API TRUE) set(HAVE_ARAVIS_API TRUE)
endif() endif()
else()
message("Can not build Aravis support without glib2")
endif()
endif(WITH_ARAVIS) endif(WITH_ARAVIS)
# --- Dc1394 --- # --- Dc1394 ---
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment