From: vsr Date: Mon, 18 Sep 2017 14:39:09 +0000 (+0300) Subject: Minimize required Qt 5 packages X-Git-Tag: V8_4_0a2^0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3bf834703912b80059971db7b99df46f60860ac6;p=tools%2Fconfiguration.git Minimize required Qt 5 packages --- diff --git a/cmake/FindSalomeQt5.cmake b/cmake/FindSalomeQt5.cmake index cceb7b0..3c6903f 100644 --- a/cmake/FindSalomeQt5.cmake +++ b/cmake/FindSalomeQt5.cmake @@ -41,15 +41,21 @@ IF(Qt5Core_FOUND) SET(QT_VERSION "${Qt5Core_VERSION}") ENDIF() -SET(Qt5_FIND_COMPONENTS Gui Widgets Network Xml OpenGL PrintSupport Help Test Sql Sensors Positioning Quick Qml Multimedia MultimediaWidgets WebChannel UiTools) +# Add mandatory Qt 5 components below +SET(Qt5_FIND_COMPONENTS Gui Widgets Network Xml OpenGL PrintSupport Help Test) +# 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) ENDIF()