From dc16d97796b263bd508e20b34306ee1b855d6ad3 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 15 Nov 2023 20:13:31 -0600 Subject: [PATCH] pkgselect CMakeLists.txt fixes --- common/modules/pkgselect/CMakeLists.txt | 7 +++++++ debian/changelog | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/common/modules/pkgselect/CMakeLists.txt b/common/modules/pkgselect/CMakeLists.txt index 4ca8a25..343dbfb 100644 --- a/common/modules/pkgselect/CMakeLists.txt +++ b/common/modules/pkgselect/CMakeLists.txt @@ -1,9 +1,16 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +include(FeatureSummary) + set( CMAKE_CXX_STANDARD 17 ) set( CMAKE_CXX_STANDARD_REQUIRED ON ) set( CALAMARES_VERSION_REQUIRED 3.3.0 ) + +find_package(ECM ${ECM_VERSION} NO_MODULE) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) +include(KDEInstallDirs) +find_package(KF5 REQUIRED COMPONENTS CoreAddons) find_package(Calamares ${CALAMARES_VERSION_REQUIRED} NO_CMAKE_PACKAGE_REGISTRY) if (NOT TARGET Calamares::calamares OR NOT TARGET Calamares::calamaresui) find_package(Calamares ${CALAMARES_VERSION_REQUIRED} REQUIRED) diff --git a/debian/changelog b/debian/changelog index c26ed1f..7297541 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares-settings-ubuntu (1:24.04.4) noble; urgency=medium + + * Fixed the pkgselect module's CMakeLists.txt file. + + -- Aaron Rainbolt Wed, 15 Nov 2023 18:33:39 -0600 + calamares-settings-ubuntu (1:24.04.3) noble; urgency=medium * Revert a failed FTBFS fix.