From a164a131f999c5089b3a769bcd9296d5d53a945e Mon Sep 17 00:00:00 2001 From: Adam Rankin Date: Wed, 24 Apr 2019 14:36:29 -0400 Subject: [PATCH] BUG: Qt5 components not correctly detected if only Qt5_DIR is provided, when this is supported by Qt CMake system. Fixed by updating Qt5 find_package call to use modern CMake syntax --- cmake/OpenCVFindLibsGUI.cmake | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cmake/OpenCVFindLibsGUI.cmake b/cmake/OpenCVFindLibsGUI.cmake index efabb3ce15..367ceb01b0 100644 --- a/cmake/OpenCVFindLibsGUI.cmake +++ b/cmake/OpenCVFindLibsGUI.cmake @@ -15,15 +15,11 @@ endif() ocv_clear_vars(HAVE_QT HAVE_QT5) if(WITH_QT) if(NOT WITH_QT EQUAL 4) - find_package(Qt5Core) - find_package(Qt5Gui) - find_package(Qt5Widgets) - find_package(Qt5Test) - find_package(Qt5Concurrent) - if(Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND AND Qt5Concurrent_FOUND) + find_package(Qt5 COMPONENTS Core Gui Widgets Test Concurrent REQUIRED NO_MODULE) + if(Qt5_FOUND) set(HAVE_QT5 ON) set(HAVE_QT ON) - find_package(Qt5OpenGL) + find_package(Qt5 COMPONENTS OpenGL QUIET) if(Qt5OpenGL_FOUND) set(QT_QTOPENGL_FOUND ON) endif()