Alx89/OpenCV-Python: Automated CI toolchain to produce precompiled opencv-python, opencv-python-headless, opencv-contrib-python and opencv-contrib-python-headless packages.

patches/patchQtPlugins

25 строк1 KB

Andrey Senyaev

Updated submodules to the release 4.5.4, added python loader support, updated Qt patch

15 окт 2021, 19:35

15 окт 2021, 19:356a1f61b

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index 4c0b3880fc..dffa0a4caa 100644
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -1187,6 +1187,13 @@ if(WITH_QT OR HAVE_QT)
   if(HAVE_QT)
     status("    QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
+    if(APPLE)
+      install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
+    endif()
+    if(UNIX AND NOT APPLE)
+      install(DIRECTORY /opt/Qt5.15.0/plugins DESTINATION lib/qt)
+      install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
+    endif()
     if(HAVE_QT_OPENGL)
       if(Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES)
         status("      QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt${QT_VERSION_MAJOR}OpenGL_LIBRARIES} ${Qt${QT_VERSION_MAJOR}OpenGL_VERSION_STRING})" ELSE NO)
       else()
         status("      QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
       endif()
     else()
       status("      QT OpenGL support:" "NO")
     endif()
   else()
     status("    QT:" "NO")