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

Merge pull request #20826 from alalek:fix_20824

Browse Source
This commit is contained in:
Alexander Alekhin 2021-10-06 20:30:48 +00:00
commit 57cd6d2de1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/highgui/CMakeLists.txt
View File

@ -51,6 +51,8 @@ set(OPENCV_HIGHGUI_BUILTIN_BACKEND "")
if(HAVE_QT) if(HAVE_QT)
set(OPENCV_HIGHGUI_BUILTIN_BACKEND "QT${QT_VERSION_MAJOR}") set(OPENCV_HIGHGUI_BUILTIN_BACKEND "QT${QT_VERSION_MAJOR}")
add_definitions(-DHAVE_QT)
if(QT_VERSION_MAJOR GREATER 4) if(QT_VERSION_MAJOR GREATER 4)
# "Automoc" doesn't work properly with opencv_world build, use QT<ver>_WRAP_CPP() directly # "Automoc" doesn't work properly with opencv_world build, use QT<ver>_WRAP_CPP() directly
#set(CMAKE_AUTOMOC ON) #set(CMAKE_AUTOMOC ON)
@ -75,6 +77,7 @@ if(HAVE_QT)
set(qt_deps Core Gui Widgets Test Concurrent) set(qt_deps Core Gui Widgets Test Concurrent)
if(HAVE_QT_OPENGL) if(HAVE_QT_OPENGL)
add_definitions(-DHAVE_QT_OPENGL)
list(APPEND qt_deps OpenGL) list(APPEND qt_deps OpenGL)
endif() endif()