[rkward/work/qtwebengine] /: Fix basic cmake problems.

[Thomas Friedrichsmeier]

Git commit 0c4bf9c3a89ae4a2b2ff88727c5b055f2dbc59b6 by Thomas Friedrichsmeier.
Committed on 29/03/2020 at 16:45.
Pushed by tfry into branch 'work/qtwebengine'.

Fix basic cmake problems.

M  +4    -4    CMakeLists.txt
M  +1    -1    rkward/CMakeLists.txt
M  +1    -1    rkward/rbackend/CMakeLists.txt
M  +5    -1    rkward/windows/CMakeLists.txt

https://commits.kde.org/rkward/0c4bf9c3a89ae4a2b2ff88727c5b055f2dbc59b6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0df4c9ce..d8a12bed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,17 +24,17 @@ INCLUDE(FeatureSummary)
 FIND_PACKAGE(Qt5 5.2 CONFIG REQUIRED COMPONENTS Widgets Core Xml Network Script PrintSupport)
 FIND_PACKAGE(KF5 5.2 REQUIRED COMPONENTS CoreAddons DocTools I18n XmlGui TextEditor WidgetsAddons Parts Config Notifications WindowSystem OPTIONAL_COMPONENTS Crash)
 IF(NOT NO_QT_WEBENGINE)
-	FIND_PACKAGE(Qt5 OPTIONAL_COMPONENTS WebEngine)
+	FIND_PACKAGE(Qt5 5.6 OPTIONAL_COMPONENTS WebEngineWidgets)
 ENDIF(NOT NO_QT_WEBENGINE)
-IF(NOT Qt5WebEngine_FOUND)
+IF(NOT Qt5WebEngineWidgets_FOUND)
 	FIND_PACKAGE(KF5 5.2 OPTIONAL_COMPONENTS WebKit)
 	IF(NOT KF5_WebKit_FOUND)
 		MESSAGE(FATAL_ERROR "At least one of KF5WebKit or QtWebEngine is required. Neither was found on this system.")
 	ENDIF(NOT KF5_WebKit_FOUND)
 	ADD_DEFINITIONS(-DNO_QT_WEBENGINE)  # TODO: rather set it for rkhtmlwindow, only
-ELSE(Qt5WebEngine_FOUND)
+ELSE(NOT Qt5WebEngineWidgets_FOUND)
 	MESSAGE(STATUS "QtWebEngine will be used for rendering HTML. To use KF5WebKit, instead (if available), pass -DNO_QT_WEBENGINE in your call to cmake.")
-ENDIF(Qt5WebEngine_FOUND)
+ENDIF(NOT Qt5WebEngineWidgets_FOUND)
 FIND_PACKAGE(Gettext REQUIRED)
 
 # FindIntl in cmake is broken for MSVC on Windows, (and only included from 3.2.3 upwards).
diff --git a/rkward/CMakeLists.txt b/rkward/CMakeLists.txt
index 5dfe6709..9594be12 100644
--- a/rkward/CMakeLists.txt
+++ b/rkward/CMakeLists.txt
@@ -27,7 +27,7 @@ ADD_SUBDIRECTORY( icons )
 ADD_SUBDIRECTORY( windows )
 ADD_SUBDIRECTORY( syntax )
 
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}   ${QT_QTWEBKIT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 SET(RKWard_Sources
 	rkward.cpp
diff --git a/rkward/rbackend/CMakeLists.txt b/rkward/rbackend/CMakeLists.txt
index 4598be0a..1b5b1819 100644
--- a/rkward/rbackend/CMakeLists.txt
+++ b/rkward/rbackend/CMakeLists.txt
@@ -43,7 +43,7 @@ SET (
 	rktransmitter.cpp
 )
 ADD_LIBRARY(rbackend STATIC ${rbackend_FRONTEND_SRCS})
-TARGET_LINK_LIBRARIES(rbackend rkgraphicsdevice.frontend Qt5::Widgets KF5::TextEditor KF5::WebKit KF5::WindowSystem)
+TARGET_LINK_LIBRARIES(rbackend rkgraphicsdevice.frontend Qt5::Widgets KF5::TextEditor KF5::WindowSystem)
 
 SET (
 	rbackend_BACKEND_SRCS
diff --git a/rkward/windows/CMakeLists.txt b/rkward/windows/CMakeLists.txt
index 50fc3d8b..7c5af7f5 100644
--- a/rkward/windows/CMakeLists.txt
+++ b/rkward/windows/CMakeLists.txt
@@ -26,4 +26,8 @@ SET(windows_STAT_SRCS
 )
 
 ADD_LIBRARY(windows STATIC ${windows_STAT_SRCS})
-TARGET_LINK_LIBRARIES(windows Qt5::Widgets Qt5::Xml Qt5::PrintSupport Qt5::WebKitWidgets KF5::TextEditor KF5::WebKit KF5::Notifications KF5::WindowSystem KF5::KIOFileWidgets)
+IF(NO_QT_WEBENGINE)
+TARGET_LINK_LIBRARIES(windows Qt5::Widgets Qt5::Xml Qt5::PrintSupport Qt5::WebEngineWidgets Qt5::WebKitWidgets KF5::WebKit KF5::TextEditor KF5::Notifications KF5::WindowSystem KF5::KIOFileWidgets)
+ELSE(NO_QT_WEBENGINE)
+TARGET_LINK_LIBRARIES(windows Qt5::Widgets Qt5::Xml Qt5::PrintSupport Qt5::WebEngineWidgets KF5::TextEditor KF5::Notifications KF5::WindowSystem KF5::KIOFileWidgets)
+ENDIF(NO_QT_WEBENGINE)