From 86e24fad9accfd139f9ca255f701e06352a80fb1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 5 Nov 2024 15:18:24 +0100 Subject: [PATCH] CMake: bump version and required release --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d049605..8dff37a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ # cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set( CALAMARES_EXTENSIONS_VERSION 3.3.1 ) +set( CALAMARES_EXTENSIONS_VERSION 3.3.11 ) include( ${CMAKE_CURRENT_LIST_DIR}/CMakeModules/ExtendedVersion.cmake ) if ( CMAKE_SCRIPT_MODE_FILE ) @@ -63,7 +63,7 @@ set( CMAKE_CXX_STANDARD_REQUIRED ON ) # consumers by loading the developer's config from a build # directory (which doesn't have the rest of the config # installed inside it). -set( CALAMARES_VERSION_REQUIRED 3.3.1 ) +set( CALAMARES_VERSION_REQUIRED 3.3.11 ) message(STATUS "Looking for Calamares system-wide") find_package(Calamares ${CALAMARES_VERSION_REQUIRED} NO_CMAKE_PACKAGE_REGISTRY) if (NOT TARGET Calamares::calamares OR NOT TARGET Calamares::calamaresui) @@ -152,7 +152,9 @@ calamares_add_module_subdirectory( modules/os-freebsd LIST_SKIPPED_MODULES ) calamares_add_module_subdirectory( modules/os-nixos LIST_SKIPPED_MODULES ) calamares_add_module_subdirectory( modules/refind LIST_SKIPPED_MODULES ) calamares_add_module_subdirectory( modules/slowpython LIST_SKIPPED_MODULES ) # Python job -calamares_add_module_subdirectory( modules/unpackfsc LIST_SKIPPED_MODULES ) +# The unpackfsc module moved into Calamares proper in 3.3.11 +# +# calamares_add_module_subdirectory( modules/unpackfsc LIST_SKIPPED_MODULES ) message(STATUS "Calamares extensions ${CALAMARES_EXTENSIONS_VERSION} for Calamares version ${Calamares_VERSION}")