File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change
1
+ Submodule opencv contains modified content
1
2
diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
2
- index 8ccad4d03a..0d5e2a79e9 100644
3
+ index 4c0b3880fc..dbe1a74622 100644
3
4
--- a/opencv/CMakeLists.txt
4
5
+++ b/opencv/CMakeLists.txt
5
- @@ -1164 ,6 +1164,7 @@ if(WITH_QT OR HAVE_QT)
6
+ @@ -1187 ,6 +1187,12 @@ if(WITH_QT OR HAVE_QT)
6
7
if(HAVE_QT5)
7
8
status(" QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
8
9
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
9
- + install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
10
+ + if(APPLE)
11
+ + install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
12
+ + endif()
13
+ + if(UNIX)
14
+ + install(DIRECTORY ${Qt5_DIR}/../../qt5/plugins DESTINATION lib/qt)
15
+ + endif()
10
16
elseif(HAVE_QT)
11
17
status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
12
18
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
You can’t perform that action at this time.
0 commit comments