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

Merge pull request #21483 from alalek:cmake_highgui_opengl_update_3.4

Browse Source
This commit is contained in:
Alexander Alekhin 2022-01-20 14:37:08 +00:00
commit ca5258f140
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/highgui/CMakeLists.txt
View File

@ -67,6 +67,9 @@ 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)
list(APPEND qt_deps OpenGL) list(APPEND qt_deps OpenGL)
if(OPENGL_LIBRARIES)
list(APPEND HIGHGUI_LIBRARIES "${OPENGL_LIBRARIES}")
endif()
endif() endif()
foreach(dt_dep ${qt_deps}) foreach(dt_dep ${qt_deps})
@ -76,8 +79,11 @@ if(HAVE_QT)
endforeach() endforeach()
else() else()
ocv_assert(QT_VERSION_MAJOR EQUAL 4) ocv_assert(QT_VERSION_MAJOR EQUAL 4)
if (HAVE_QT_OPENGL) if(HAVE_QT_OPENGL)
set(QT_USE_QTOPENGL TRUE) set(QT_USE_QTOPENGL TRUE)
if(OPENGL_LIBRARIES)
list(APPEND HIGHGUI_LIBRARIES "${OPENGL_LIBRARIES}")
endif()
endif() endif()
include(${QT_USE_FILE}) include(${QT_USE_FILE})
@ -130,6 +136,9 @@ elseif(HAVE_WIN32UI)
if(OpenCV_ARCH STREQUAL "ARM64") if(OpenCV_ARCH STREQUAL "ARM64")
list(APPEND HIGHGUI_LIBRARIES "comdlg32" "advapi32") list(APPEND HIGHGUI_LIBRARIES "comdlg32" "advapi32")
endif() endif()
if(HAVE_OPENGL AND OPENGL_LIBRARIES)
list(APPEND HIGHGUI_LIBRARIES "${OPENGL_LIBRARIES}")
endif()
elseif(HAVE_GTK OR HAVE_GTK3) elseif(HAVE_GTK OR HAVE_GTK3)
list(APPEND highgui_srcs ${CMAKE_CURRENT_LIST_DIR}/src/window_gtk.cpp) list(APPEND highgui_srcs ${CMAKE_CURRENT_LIST_DIR}/src/window_gtk.cpp)
elseif(HAVE_CARBON) elseif(HAVE_CARBON)
@ -163,10 +172,6 @@ if(APPLE)
add_apple_compiler_options(${the_module}) add_apple_compiler_options(${the_module})
endif() endif()
if(HAVE_WIN32UI AND HAVE_OPENGL AND OPENGL_LIBRARIES)
ocv_target_link_libraries(${the_module} PRIVATE "${OPENGL_LIBRARIES}")
endif()
if(MSVC AND NOT BUILD_SHARED_LIBS AND BUILD_WITH_STATIC_CRT) if(MSVC AND NOT BUILD_SHARED_LIBS AND BUILD_WITH_STATIC_CRT)
set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /NODEFAULTLIB:libcmt.lib /DEBUG") set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /NODEFAULTLIB:libcmt.lib /DEBUG")
endif() endif()