[neon/neon/calamares-settings/slideshow-refactor] /: Cleanup

[Mike Stemle]

Git commit 76f9b8f9baa40ba8ee184fabe48b17e0f8eb88bd by Mike Stemle.
Committed on 09/07/2024 at 21:48.
Pushed by mstemle into branch 'slideshow-refactor'.

Cleanup
- Much of the `CMakeLists.txt` was unnecessary
- We don't need Kirigami at the moment

M  +3    -22   CMakeLists.txt
M  +0    -2    desktop/calamares/desktop/branding/neon/slides.qml

https://invent.kde.org/neon/neon/calamares-settings/-/commit/76f9b8f9baa40ba8ee184fabe48b17e0f8eb88bd

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 176871a..a9f9e57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,32 +2,14 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
 # Versions
 set(CALAMARES_SETTINGS_VERSION 3.9.7)
-set(KF_VERSION "6.3.0") # handled by release scripts
-set(REQUIRED_QT_VERSION 6.5.0)
-set(ECM_VERSION 6.1.0)
 
 # Programs we need
-# find_program(po2ts_PROG po2ts REQUIRED)
 find_program(lrelease_PROG lrelease REQUIRED)
 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)
-
 # Adding the Calamares Branding
 set(branding_path "desktop/calamares/desktop/branding/neon")
 set(lang_path "${branding_path}/lang")
@@ -36,6 +18,7 @@ find_package(Calamares)
 include(CalamaresAddBrandingSubdirectory)
 include(CalamaresAddTranslations)
 
+# Grab all PO files
 file( GLOB po_paths RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "po/**/*.po" )
 list(SORT po_paths)
 message(STATUS "Processing language files")
@@ -45,20 +28,18 @@ foreach(po_file ${po_paths})
     REGEX REPLACE
     "po\/([a-zA-Z at _]+)\/calamares-slideshow.po" "\\1"
     po_lang_name "${po_file}")
-  message("Processing lang: ${po_lang_name}")
+
   set(ts_file "${branding_path}/lang/calamares-neon_${po_lang_name}.ts")
-  set(qm_file "${branding_path}/lang/calamares-neon_${po_lang_name}.qm")
   add_custom_command(
     OUTPUT "${ts_file}"
     DEPENDS "${po_file}"
     COMMAND ${lconvert_PROG} -o ${ts_file} -of ts -i ${po_file} -if po
-    # COMMAND ${lrelease_PROG} ${ts_file}
-    # BYPRODUCTS "${ts_file}" "${qm_file}"
     BYPRODUCTS "${ts_file}"
     VERBATIM
   )
   list(APPEND lang_deps "${ts_file}")
 endforeach()
+
 add_custom_target(calamares-settings ALL DEPENDS ${lang_deps})
 calamares_add_branding(neon DIRECTORY ${branding_path} SUBDIRECTORIES assets)
 calamares_add_branding_translations(neon DIRECTORY "${branding_path}")
diff --git a/desktop/calamares/desktop/branding/neon/slides.qml b/desktop/calamares/desktop/branding/neon/slides.qml
index 4c57f30..9868a3e 100644
--- a/desktop/calamares/desktop/branding/neon/slides.qml
+++ b/desktop/calamares/desktop/branding/neon/slides.qml
@@ -14,8 +14,6 @@ import QtQuick.Controls
 import QtQml.XmlListModel
 
 import calamares.slideshow
-// import org.kde.kirigami as Kirigami
-
 
 Presentation
 {