Skip to content

Commit e5aa213

Browse files
alalekalalek
committed
Merge pull request opencv#9056 from mshabunin:fix-videoio-deps
2 parents c235bbf + 6320ede commit e5aa213

File tree

3 files changed

+24
-40
lines changed

3 files changed

+24
-40
lines changed

‎cmake/OpenCVFindLibsGUI.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,24 @@ endif()
4242
ocv_clear_vars(HAVE_GTK HAVE_GTK3 HAVE_GTHREAD HAVE_GTKGLEXT)
4343
if(WITH_GTK AND NOT HAVE_QT)
4444
if(NOT WITH_GTK_2_X)
45-
CHECK_MODULE(gtk+-3.0 HAVE_GTK3)
45+
CHECK_MODULE(gtk+-3.0 HAVE_GTK3 HIGHGUI)
4646
if(HAVE_GTK3)
4747
set(HAVE_GTK TRUE)
4848
endif()
4949
endif()
5050
if(NOT HAVE_GTK)
51-
CHECK_MODULE(gtk+-2.0 HAVE_GTK)
51+
CHECK_MODULE(gtk+-2.0 HAVE_GTK HIGHGUI)
5252
if(HAVE_GTK AND (ALIASOF_gtk+-2.0_VERSION VERSION_LESS MIN_VER_GTK))
5353
message (FATAL_ERROR "GTK support requires a minimum version of ${MIN_VER_GTK} (${ALIASOF_gtk+-2.0_VERSION} found)")
5454
set(HAVE_GTK FALSE)
5555
endif()
5656
endif()
57-
CHECK_MODULE(gthread-2.0 HAVE_GTHREAD)
57+
CHECK_MODULE(gthread-2.0 HAVE_GTHREAD HIGHGUI)
5858
if(HAVE_GTK AND NOT HAVE_GTHREAD)
5959
message(FATAL_ERROR "gthread not found. This library is required when building with GTK support")
6060
endif()
6161
if(WITH_OPENGL AND NOT HAVE_GTK3)
62-
CHECK_MODULE(gtkglext-1.0 HAVE_GTKGLEXT)
62+
CHECK_MODULE(gtkglext-1.0 HAVE_GTKGLEXT HIGHGUI)
6363
endif()
6464
endif()
6565

‎cmake/OpenCVFindLibsVideo.cmake

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ if(WITH_GSTREAMER AND NOT WITH_GSTREAMER_0_10)
2727
ENDIF(GSTREAMER_gstbase_LIBRARY AND GSTREAMER_gstvideo_LIBRARY AND GSTREAMER_gstapp_LIBRARY AND GSTREAMER_gstpbutils_LIBRARY AND GSTREAMER_gstriff_LIBRARY)
2828

2929
else(WIN32)
30-
CHECK_MODULE(gstreamer-base-1.0 HAVE_GSTREAMER_BASE)
31-
CHECK_MODULE(gstreamer-video-1.0 HAVE_GSTREAMER_VIDEO)
32-
CHECK_MODULE(gstreamer-app-1.0 HAVE_GSTREAMER_APP)
33-
CHECK_MODULE(gstreamer-riff-1.0 HAVE_GSTREAMER_RIFF)
34-
CHECK_MODULE(gstreamer-pbutils-1.0 HAVE_GSTREAMER_PBUTILS)
30+
CHECK_MODULE(gstreamer-base-1.0 HAVE_GSTREAMER_BASE VIDEOIO)
31+
CHECK_MODULE(gstreamer-video-1.0 HAVE_GSTREAMER_VIDEO VIDEOIO)
32+
CHECK_MODULE(gstreamer-app-1.0 HAVE_GSTREAMER_APP VIDEOIO)
33+
CHECK_MODULE(gstreamer-riff-1.0 HAVE_GSTREAMER_RIFF VIDEOIO)
34+
CHECK_MODULE(gstreamer-pbutils-1.0 HAVE_GSTREAMER_PBUTILS VIDEOIO)
3535

3636
if(HAVE_GSTREAMER_BASE AND HAVE_GSTREAMER_VIDEO AND HAVE_GSTREAMER_APP AND HAVE_GSTREAMER_RIFF AND HAVE_GSTREAMER_PBUTILS)
3737
set(HAVE_GSTREAMER TRUE)
@@ -46,11 +46,11 @@ endif(WITH_GSTREAMER AND NOT WITH_GSTREAMER_0_10)
4646

4747
# if gstreamer 1.x was not found, or we specified we wanted 0.10, try to find it
4848
if(WITH_GSTREAMER AND NOT HAVE_GSTREAMER OR WITH_GSTREAMER_0_10)
49-
CHECK_MODULE(gstreamer-base-0.10 HAVE_GSTREAMER_BASE)
50-
CHECK_MODULE(gstreamer-video-0.10 HAVE_GSTREAMER_VIDEO)
51-
CHECK_MODULE(gstreamer-app-0.10 HAVE_GSTREAMER_APP)
52-
CHECK_MODULE(gstreamer-riff-0.10 HAVE_GSTREAMER_RIFF)
53-
CHECK_MODULE(gstreamer-pbutils-0.10 HAVE_GSTREAMER_PBUTILS)
49+
CHECK_MODULE(gstreamer-base-0.10 HAVE_GSTREAMER_BASE VIDEOIO)
50+
CHECK_MODULE(gstreamer-video-0.10 HAVE_GSTREAMER_VIDEO VIDEOIO)
51+
CHECK_MODULE(gstreamer-app-0.10 HAVE_GSTREAMER_APP VIDEOIO)
52+
CHECK_MODULE(gstreamer-riff-0.10 HAVE_GSTREAMER_RIFF VIDEOIO)
53+
CHECK_MODULE(gstreamer-pbutils-0.10 HAVE_GSTREAMER_PBUTILS VIDEOIO)
5454

5555
if(HAVE_GSTREAMER_BASE AND HAVE_GSTREAMER_VIDEO AND HAVE_GSTREAMER_APP AND HAVE_GSTREAMER_RIFF AND HAVE_GSTREAMER_PBUTILS)
5656
set(HAVE_GSTREAMER TRUE)
@@ -65,8 +65,8 @@ endif(WITH_GSTREAMER AND NOT HAVE_GSTREAMER OR WITH_GSTREAMER_0_10)
6565
# --- unicap ---
6666
ocv_clear_vars(HAVE_UNICAP)
6767
if(WITH_UNICAP)
68-
CHECK_MODULE(libunicap HAVE_UNICAP_)
69-
CHECK_MODULE(libucil HAVE_UNICAP_UCIL)
68+
CHECK_MODULE(libunicap HAVE_UNICAP_ VIDEOIO)
69+
CHECK_MODULE(libucil HAVE_UNICAP_UCIL VIDEOIO)
7070
if(HAVE_UNICAP_ AND HAVE_UNICAP_UCIL)
7171
set(HAVE_UNICAP TRUE)
7272
endif()
@@ -162,25 +162,25 @@ if(WITH_1394)
162162
"${CMU1394_LIB_DIR}/lib1394camera.a")
163163
endif(HAVE_DC1394_2)
164164
else(WIN32 AND MINGW)
165-
CHECK_MODULE(libdc1394-2 HAVE_DC1394_2)
165+
CHECK_MODULE(libdc1394-2 HAVE_DC1394_2 VIDEOIO)
166166
if(NOT HAVE_DC1394_2)
167-
CHECK_MODULE(libdc1394 HAVE_DC1394)
167+
CHECK_MODULE(libdc1394 HAVE_DC1394 VIDEOIO)
168168
endif()
169169
endif(WIN32 AND MINGW)
170170
endif(WITH_1394)
171171

172172
# --- xine ---
173173
ocv_clear_vars(HAVE_XINE)
174174
if(WITH_XINE)
175-
CHECK_MODULE(libxine HAVE_XINE)
175+
CHECK_MODULE(libxine HAVE_XINE VIDEOIO)
176176
endif(WITH_XINE)
177177

178178
# --- V4L ---
179179
ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2 HAVE_VIDEOIO)
180180
if(WITH_V4L)
181181
if(WITH_LIBV4L)
182-
CHECK_MODULE(libv4l1 HAVE_LIBV4L1)
183-
CHECK_MODULE(libv4l2 HAVE_LIBV4L2)
182+
CHECK_MODULE(libv4l1 HAVE_LIBV4L1 VIDEOIO)
183+
CHECK_MODULE(libv4l2 HAVE_LIBV4L2 VIDEOIO)
184184
if(HAVE_LIBV4L1 AND HAVE_LIBV4L2)
185185
set(HAVE_LIBV4L YES)
186186
else()
@@ -301,7 +301,7 @@ endif()
301301
# --- gPhoto2 ---
302302
ocv_clear_vars(HAVE_GPHOTO2)
303303
if(WITH_GPHOTO2)
304-
CHECK_MODULE(libgphoto2 HAVE_GPHOTO2)
304+
CHECK_MODULE(libgphoto2 HAVE_GPHOTO2 VIDEOIO)
305305
endif(WITH_GPHOTO2)
306306

307307
# --- VA & VA_INTEL ---

‎cmake/OpenCVUtils.cmake

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ endmacro()
499499
# Macros that checks if module have been installed.
500500
# After it adds module to build and define
501501
# constants passed as second arg
502-
macro(CHECK_MODULE module_name define)
502+
macro(CHECK_MODULE module_name define cv_module)
503503
set(${define} 0)
504504
if(PKG_CONFIG_FOUND)
505505
set(ALIAS ALIASOF_${module_name})
@@ -509,25 +509,9 @@ macro(CHECK_MODULE module_name define)
509509
set(ALIAS_LIBRARIES ${ALIAS}_LIBRARIES)
510510

511511
PKG_CHECK_MODULES(${ALIAS} ${module_name})
512-
513512
if(${ALIAS_FOUND})
514513
set(${define} 1)
515-
foreach(P "${ALIAS_INCLUDE_DIRS}")
516-
if(${P})
517-
list(APPEND VIDEOIO_INCLUDE_DIRS ${${P}})
518-
list(APPEND HIGHGUI_INCLUDE_DIRS ${${P}})
519-
endif()
520-
endforeach()
521-
522-
foreach(P "${ALIAS_LIBRARY_DIRS}")
523-
if(${P})
524-
list(APPEND VIDEOIO_LIBRARY_DIRS ${${P}})
525-
list(APPEND HIGHGUI_LIBRARY_DIRS ${${P}})
526-
endif()
527-
endforeach()
528-
529-
list(APPEND VIDEOIO_LIBRARIES ${${ALIAS_LIBRARIES}})
530-
list(APPEND HIGHGUI_LIBRARIES ${${ALIAS_LIBRARIES}})
514+
ocv_append_build_options(${cv_module} ${ALIAS})
531515
endif()
532516
endif()
533517
endmacro()

0 commit comments

Comments
 (0)