potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages Releases Wiki Activity

Removed extra dependencies from videoio library

Browse Source
This commit is contained in:
Maksim Shabunin
2017-06-30 18:21:43 +03:00
parent a84a5e8f1a
commit 6320ede98e
3 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVFindLibsGUI.cmake
+4 -4
View File
@@ -42,24 +42,24 @@ endif()
ocv_clear_vars(HAVE_GTK HAVE_GTK3 HAVE_GTHREAD HAVE_GTKGLEXT)
if(WITH_GTK AND NOT HAVE_QT)
if(NOT WITH_GTK_2_X)
CHECK_MODULE(gtk+-3.0 HAVE_GTK3)
CHECK_MODULE(gtk+-3.0 HAVE_GTK3 HIGHGUI)
if(HAVE_GTK3)
set(HAVE_GTK TRUE)
endif()
endif()
if(NOT HAVE_GTK)
CHECK_MODULE(gtk+-2.0 HAVE_GTK)
CHECK_MODULE(gtk+-2.0 HAVE_GTK HIGHGUI)
if(HAVE_GTK AND (ALIASOF_gtk+-2.0_VERSION VERSION_LESS MIN_VER_GTK))
message (FATAL_ERROR "GTK support requires a minimum version of ${MIN_VER_GTK} (${ALIASOF_gtk+-2.0_VERSION} found)")
set(HAVE_GTK FALSE)
endif()
endif()
CHECK_MODULE(gthread-2.0 HAVE_GTHREAD)
CHECK_MODULE(gthread-2.0 HAVE_GTHREAD HIGHGUI)
if(HAVE_GTK AND NOT HAVE_GTHREAD)
message(FATAL_ERROR "gthread not found. This library is required when building with GTK support")
endif()
if(WITH_OPENGL AND NOT HAVE_GTK3)
CHECK_MODULE(gtkglext-1.0 HAVE_GTKGLEXT)
CHECK_MODULE(gtkglext-1.0 HAVE_GTKGLEXT HIGHGUI)
endif()
endif()