[education/rkward] /: Clean up
Thomas Friedrichsmeier
null at kde.org
Sat Mar 26 11:25:55 GMT 2022
Git commit 5a9ab1de4dc599d787c3d1b049b60f860ccac50d by Thomas Friedrichsmeier.
Committed on 26/03/2022 at 11:25.
Pushed by tfry into branch 'master'.
Clean up
M +2 -2 CMakeLists.txt
M +0 -3 tests/CMakeLists.txt
https://invent.kde.org/education/rkward/commit/5a9ab1de4dc599d787c3d1b049b60f860ccac50d
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c47e5be7..c610056a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,10 +21,10 @@ INCLUDE(ECMAddAppIcon)
INCLUDE(ECMMarkNonGuiExecutable)
INCLUDE(FeatureSummary)
-FIND_PACKAGE(Qt5 5.2 CONFIG REQUIRED COMPONENTS Widgets Core Xml Network Script PrintSupport)
+FIND_PACKAGE(Qt5 5.5 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 Archive OPTIONAL_COMPONENTS Crash)
IF(NOT NO_QT_WEBENGINE)
- FIND_PACKAGE(Qt5 5.2 OPTIONAL_COMPONENTS WebEngineWidgets)
+ FIND_PACKAGE(Qt5 5.5 OPTIONAL_COMPONENTS WebEngineWidgets)
IF(NOT Qt5WebEngineWidgets_FOUND OR Qt5WebEngineWidgets_VERSION VERSION_LESS "5.12.0")
MESSAGE(STATUS "QWebEngine not available (or version < 5.12). Falling back to QtWebKit")
SET(NO_QT_WEBENGINE 1)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5d1ca0ab..5396f62f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,6 +1,3 @@
ADD_CUSTOM_TARGET (plugintests
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../rkward/rkward --evaluate "source\\(\\\"all_tests.R\\\"\\)"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-
-# This will hopefully run *after* everything is installed
-INSTALL(CODE "MESSAGE(STATUS \"\n--------------------\nInstallation appears to be complete (unfortunately it is hard to tell in CMake).\nIn case of errors, please make sure to consult the file 'INSTALL'.\n--------------------\")")
More information about the rkward-tracker
mailing list