From 400613f41f3886fa4e66ecd277bd882750683344 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Mon, 2 Nov 2020 18:05:44 +0100
Subject: [PATCH] Minor cmake cleanup

---
 CMakeLists.txt     | 10 ++--------
 src/CMakeLists.txt |  4 +---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ebde19c4..2cb62ad61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,10 @@ set(QT_MIN_VERSION "5.15.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 
-
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 include(FeatureSummary)
 include(ECMSetupVersion)
@@ -20,18 +20,12 @@ include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 
 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Core Quick Gui QuickControls2 Multimedia)
-find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
-    Kirigami2
-    ItemModels
-    I18n
-)
+find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED COMPONENTS Kirigami2 ItemModels I18n)
 
 find_package(Quotient 0.7 REQUIRED)
-
 find_package(Qt5Keychain REQUIRED)
 find_package(cmark REQUIRED)
 
-
 install(PROGRAMS org.kde.neochat.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES org.kde.neochat.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 #install(FILES neochat.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 675e82327..337c0a0fa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(neochat_SRCS
+add_executable(neochat
     accountlistmodel.cpp
     controller.cpp
     emojimodel.cpp
@@ -18,8 +18,6 @@ set(neochat_SRCS
     ../res.qrc
 )
 
-add_executable(neochat ${neochat_SRCS})
-
 target_link_libraries(neochat Qt5::Widgets Qt5::Quick Qt5::Qml Qt5::Gui Qt5::Network Qt5::QuickControls2 KF5::Kirigami2 Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES})
 
 install(TARGETS neochat ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})