napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: be more verbose about choice of webkit vs engine

Browse Source
This commit is contained in:
Adriaan de Groot 2017-07-25 09:44:34 +02:00
parent c2c55dede1
commit a23b7c2a00
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/webview/CMakeLists.txt
View File

@ -7,7 +7,9 @@ list( APPEND CALA_WEBVIEW_LINK_LIBRARIES
option( WEBVIEW_FORCE_WEBKIT "Always build webview with WebKit instead of WebEngine regardless of Qt version." OFF) option( WEBVIEW_FORCE_WEBKIT "Always build webview with WebKit instead of WebEngine regardless of Qt version." OFF)
message( STATUS "Found Qt version ${Qt5Core_VERSION}")
if ( Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT ) if ( Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT )
message( STATUS " .. using webkit")
find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebKit WebKitWidgets ) find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebKit WebKitWidgets )
list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES
@ -19,6 +21,7 @@ if ( Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT )
) )
set( WEBVIEW_WITH_WEBKIT 1 ) set( WEBVIEW_WITH_WEBKIT 1 )
else() else()
message( STATUS " .. using webengine")
find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets ) find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets )
list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES