mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-02 22:28:59 +08:00
401578455f
* [OpenCV4] update to v4.5.5 * [OpenCV] bump version * [gstreamer] fix build for opencv * fix references * [vcpkg-tool-meson] fix nuget packaging * fix references * [gstreamer] fix references * [ogre] update vcpkg tools * fix references * [OpenCV4] fixes from CI runs * fix references * [OpenCV4] force python module also in debug builds * fix references * [harfbuzz] fix cmake config * harfbuzz fixes * fix references * [OpenCV4] remove unnecessary lines from patches * fix references * fix references * [harfbuzz] bump version * [harfbuzz] fix for single config builds * fix references * freetype fixes * fix references * fix ogre references * fix references, again * python when building static windows opencv libraries is unsupported * fix references * fix * refs * use required when necessary * fix references * do not use config for hdf5, use internal module * fix references * use proper spelling for freetype config cmake * fix references * [OpenCV] restore versions after merge * fix references * [leptonica] fix building * fix references * do not require package in optional features * £fix references * fix python feat * update version * update version * [ffmpeg] remove opengl feat on arm64-windows * format manifest * fix references * fix cuda/nvidia features compatibility matrix * fix manifest * fix * fix * fix references * fix references, again * move CONTROL to manifest * [gstreamer] bump versions * fix references Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
12 lines
375 B
Diff
12 lines
375 B
Diff
--- a/modules/highgui/CMakeLists.txt
|
|
+++ b/modules/highgui/CMakeLists.txt
|
|
@@ -271,7 +271,7 @@ if(APPLE)
|
|
add_apple_compiler_options(${the_module})
|
|
endif()
|
|
|
|
-if(OPENCV_HIGHGUI_BUILTIN_BACKEND STREQUAL "WIN32UI" AND HAVE_OPENGL AND OPENGL_LIBRARIES)
|
|
+if(HAVE_OPENGL AND OPENGL_LIBRARIES)
|
|
ocv_target_link_libraries(${the_module} PRIVATE "${OPENGL_LIBRARIES}")
|
|
endif()
|
|
|