[neon/neon/calamares-settings/slideshow-refactor] /: Prior cleanup was a bit _too_ clean.
Mike Stemle
null at kde.org
Wed Jul 10 01:38:57 BST 2024
Git commit 01a6609c848d7bdede623abd77047ed93012faf5 by Mike Stemle.
Committed on 10/07/2024 at 00:38.
Pushed by mstemle into branch 'slideshow-refactor'.
Prior cleanup was a bit _too_ clean.
- Re-added all of the necessary modules
- Install works again.
M +2 -0 .gitignore
M +20 -0 CMakeLists.txt
https://invent.kde.org/neon/neon/calamares-settings/-/commit/01a6609c848d7bdede623abd77047ed93012faf5
diff --git a/.gitignore b/.gitignore
index 38fee34..df27663 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
**/*.kdev4
+**/*.qm
+**/*.ts
po/**/*.po
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9f9e57..b462a93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
# Versions
set(CALAMARES_SETTINGS_VERSION 3.9.7)
+set(KF_VERSION "6.3.0")
+set(REQUIRED_QT_VERSION 6.5.0)
+set(ECM_VERSION 6.1.0)
# Programs we need
find_program(lrelease_PROG lrelease REQUIRED)
@@ -10,6 +13,23 @@ find_program(lconvert_PROG lconvert REQUIRED)
# Our project
project(calamares-settings VERSION ${CALAMARES_SETTINGS_VERSION})
+include(FeatureSummary)
+
+find_package(ECM ${ECM_VERSION} NO_MODULE)
+set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules")
+feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+include(KDEInstallDirs)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+include(KDECMakeSettings)
+
+find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Qml)
+
+
+feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
# Adding the Calamares Branding
set(branding_path "desktop/calamares/desktop/branding/neon")
set(lang_path "${branding_path}/lang")
More information about the Neon-commits
mailing list