From f3a20e2eda6d17133a07e99ab2d5a09e5be21ddb Mon Sep 17 00:00:00 2001 From: Gilles DAVID Date: Wed, 25 Oct 2017 14:19:37 +0200 Subject: [PATCH] WebKit and WebKitWidgets for Qt5 are mandatory If put in optional list, the Qt5WebKit_DIR and Qt5WebKitWidgets_DIR variables are not exported. --- cmake/FindSalomeQt5.cmake | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/cmake/FindSalomeQt5.cmake b/cmake/FindSalomeQt5.cmake index 3c6903f..b13367e 100644 --- a/cmake/FindSalomeQt5.cmake +++ b/cmake/FindSalomeQt5.cmake @@ -42,18 +42,10 @@ IF(Qt5Core_FOUND) ENDIF() # Add mandatory Qt 5 components below -SET(Qt5_FIND_COMPONENTS Gui Widgets Network Xml OpenGL PrintSupport Help Test) +SET(Qt5_FIND_COMPONENTS Gui Widgets Network Xml OpenGL PrintSupport Help Test WebKit WebKitWidgets) # Add optional Qt 5 components below SET(Qt5_OPTIONAL_COMPONENTS) -IF ("${QT_VERSION}" VERSION_LESS "5.6.0") - # QtWebKit package is used with Qt < 5.6 - LIST(APPEND Qt5_FIND_COMPONENTS WebKit WebKitWidgets) -ELSE() - # QtWebEngine package is (optionally) used with Qt >= 5.6 - LIST(APPEND Qt5_OPTIONAL_COMPONENTS WebEngine WebEngineWidgets) -ENDIF() - IF(NOT WIN32) ## QtX11Extras package is used on Linux only LIST(APPEND Qt5_FIND_COMPONENTS X11Extras) -- 2.39.2