Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed CMake modules {Js,WebView}ProviderConfig

This commit is contained in:
Martchus 2016-04-21 23:58:52 +02:00
parent e3eb263962
commit 3ccbb07bbf
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/modules/JsProviderConfig.cmake
View File

@ -5,27 +5,28 @@ if(${JS_PROVIDER} STREQUAL "auto")
find_package(Qt5Script)
if(Qt5Script_FOUND)
set(JS_PROVIDER Qt5::Script)
set(JS_DEFINITION "-D${META_PROJECT_NAME}USE_SCRIPT")
set(JS_DEFINITION "-D${META_PROJECT_VARNAME_UPPER}_USE_SCRIPT")
message(STATUS "No JavaScript provider explicitly specified, defaulting to Qt Script.")
else()
find_package(Qt5Qml REQUIRED)
set(JS_PROVIDER Qt5::Qml)
set(JS_DEFINITION "-D${META_PROJECT_NAME}USE_JSENGINE")
set(JS_DEFINITION "-D${META_PROJECT_VARNAME_UPPER}_USE_JSENGINE")
message(STATUS "No JavaScript provider explicitly specified, defaulting to Qt QML.")
endif()
else()
if(${JS_PROVIDER} STREQUAL "script")
find_package(Qt5Script REQUIRED)
set(JS_PROVIDER Qt5::Script)
set(JS_DEFINITION "-D${META_PROJECT_NAME}USE_SCRIPT")
set(JS_DEFINITION "-D${META_PROJECT_VARNAME_UPPER}_USE_SCRIPT")
message(STATUS "Using Qt Script as JavaScript provider.")
elseif(${JS_PROVIDER} STREQUAL "qml")
find_package(Qt5Qml REQUIRED)
set(JS_PROVIDER Qt5::Qml)
set(JS_DEFINITION "-D${META_PROJECT_NAME}USE_JSENGINE")
set(JS_DEFINITION "-D${META_PROJECT_VARNAME_UPPER}_USE_JSENGINE")
message(STATUS "Using Qt QML as JavaScript provider.")
elseif(${JS_PROVIDER} STREQUAL "none")
set(JS_DEFINITION "-D${META_PROJECT_NAME}NO_JSENGINE")
set(JS_PROVIDER "")
set(JS_DEFINITION "-D${META_PROJECT_VARNAME_UPPER}_NO_JSENGINE")
message(STATUS "JavaScript provider has been disabled.")
else()
message(FATAL_ERROR "The specified JavaScript provider '${JS_PROVIDER}' is unknown.")
@ -33,3 +34,4 @@ else()
endif()
list(APPEND LIBRARIES ${JS_PROVIDER})
add_definitions(${JS_DEFINITION})

12
cmake/modules/WebViewProviderConfig.cmake
View File

@ -5,27 +5,28 @@ if(${WEBVIEW_PROVIDER} STREQUAL "auto")
find_package(Qt5WebKitWidgets)
if(Qt5WebKitWidgets_FOUND)
set(WEBVIEW_PROVIDER Qt5::WebKitWidgets)
set(JS_DEFINITION "-D${META_PROJECT_NAME}USE_WEBKIT")
set(WEBVIEW_DEFINITION "-D${META_PROJECT_VARNAME_UPPER}_USE_WEBKIT")
message(STATUS "No web view provider explicitly specified, defaulting to Qt WebKit.")
else()
find_package(Qt5WebEngineWidgets REQUIRED)
set(WEBVIEW_PROVIDER Qt5::WebEngineWidgets)
set(JS_DEFINITION "-D${META_PROJECT_NAME}USE_WEBENGINE")
set(WEBVIEW_DEFINITION "-D${META_PROJECT_VARNAME_UPPER}_USE_WEBENGINE")
message(STATUS "No web view provider explicitly specified, defaulting to Qt WebEngine.")
endif()
else()
if(${WEBVIEW_PROVIDER} STREQUAL "webkit")
find_package(Qt5WebKitWidgets REQUIRED)
set(WEBVIEW_PROVIDER Qt5::WebKitWidgets)
set(JS_DEFINITION "-D${META_PROJECT_NAME}USE_WEBKIT")
set(WEBVIEW_DEFINITION "-D${META_PROJECT_VARNAME_UPPER}_USE_WEBKIT")
message(STATUS "Using Qt WebKit as webview provider.")
elseif(${WEBVIEW_PROVIDER} STREQUAL "webengine")
find_package(Qt5WebEngineWidgets REQUIRED)
set(WEBVIEW_PROVIDER Qt5::WebEngineWidgets)
set(JS_DEFINITION "-D${META_PROJECT_NAME}USE_WEBENGINE")
set(WEBVIEW_DEFINITION "-D${META_PROJECT_VARNAME_UPPER}_USE_WEBENGINE")
message(STATUS "Using Qt WebEngine as webview provider.")
elseif(${WEBVIEW_PROVIDER} STREQUAL "none")
set(JS_DEFINITION "-D${META_PROJECT_NAME}NO_WEBVIEW")
set(WEBVIEW_DEFINITION "-D${META_PROJECT_VARNAME_UPPER}_NO_WEBVIEW")
set(WEBVIEW_PROVIDER "")
message(STATUS "Webview has been disabled.")
else()
message(FATAL_ERROR "The specified web view provider '${WEBVIEW_PROVIDER}' is unknown.")
@ -33,3 +34,4 @@ else()
endif()
list(APPEND LIBRARIES ${WEBVIEW_PROVIDER})
add_definitions(${WEBVIEW_DEFINITION})