Skip to content

Commit

Permalink
Changes: wrangle release
Browse files Browse the repository at this point in the history
Pretend there was never a 3.11 (there was no tag, anyway) and
go straight to 3.12, while repairing the CMake code that
imports CalamaresConfig.
  • Loading branch information
adriaandegroot committed Nov 21, 2024
1 parent cfdf15f commit 81b4f01
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ This is the changelog for Calamares-Extensions. For each release, the major
changes and contributors are listed. Note that Calamares-Extensions does not
have a historical changelog -- this log starts with version 1.0.0.

# 3.3.11 (2024-11-05)
# 3.3.12 (2024-11-21)

This is a release to match Calamares 3.3.11. The *unpackfsc* module has
This is a release to match Calamares 3.3.12. The *unpackfsc* module has
moved to Calamares proper. There is a new module *flatpakinfo* that
tries to populate a netinstall key with packages available as flatpak.

Expand Down
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)

set( CALAMARES_EXTENSIONS_VERSION 3.3.11 )
set( CALAMARES_EXTENSIONS_VERSION 3.3.12 )

include( ${CMAKE_CURRENT_LIST_DIR}/CMakeModules/ExtendedVersion.cmake )
if ( CMAKE_SCRIPT_MODE_FILE )
Expand All @@ -63,12 +63,12 @@ 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.11 )
set( CALAMARES_VERSION_REQUIRED 3.3.12 )
message(STATUS "Looking for Calamares system-wide")
find_package(Calamares ${CALAMARES_VERSION_REQUIRED} NO_CMAKE_PACKAGE_REGISTRY)
find_package(Calamares ${CALAMARES_VERSION_REQUIRED} CONFIG NO_CMAKE_PACKAGE_REGISTRY)
if (NOT TARGET Calamares::calamares OR NOT TARGET Calamares::calamaresui)
message(STATUS "Looking for Calamares in the package registry")
find_package(Calamares ${CALAMARES_VERSION_REQUIRED} REQUIRED)
find_package(Calamares ${CALAMARES_VERSION_REQUIRED} CONFIG REQUIRED)
endif()

message(STATUS "Found Calamares version ${Calamares_VERSION}")
Expand All @@ -78,11 +78,11 @@ message(STATUS "")
### EXTRACTING DEPENDENCIES AND CONFIGURATION FROM CALAMARES
#
#
if(WITH_QT6)
if(Calamares_WITH_QT6)
set(kfname "KF6")
set(KF_VERSION 5.240) # KDE Neon weirdness
else()
message(STATUS "Building Calamares with Qt5")
message(STATUS "Building Calamares-extensions with Qt5")
set(kfname "KF5")
set(KF_VERSION 5.78)
# API that was deprecated before Qt 5.15 causes a compile error
Expand Down

0 comments on commit 81b4f01

Please sign in to comment.