mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-17 23:51:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin 2017-07-14 14:31:57 +00:00
commit 1d2baf0bd3
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/OpenCVFindLibsVideo.cmake
View File

@ -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)
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 ---