From c4d8914b04aa50814c79b3d04330d613e4dc5fa9 Mon Sep 17 00:00:00 2001 From: Christopher Wellons Date: Sun, 11 Oct 2026 12:34:25 -0400 Subject: [PATCH] Upgrade to CMake 4.4.4 Patch refreshed. Co-Authored-By: Claude Opus 5.5 --- Dockerfile | 4 ++-- src/README.md | 4 ++-- src/cmake/force-ninja.patch | 10 +++++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index de6cc74..9ee7ec8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -180,8 +180,8 @@ RUN mkdir ninja \ && tar xzf ninja-$NINJA_VERSION.tar.gz -C ninja --strip-components=1 FROM base AS dl-cmake -ARG CMAKE_VERSION=4.4.3 \ - CMAKE_SHA256=c46400618b4f1f2b43507f24fb22f3ae830c3416cf23b776e16e1d413aa892f0 +ARG CMAKE_VERSION=4.4.4 \ + CMAKE_SHA256=bd24c30d80a7744ae84b845ff080cc8453b06c622ef01066564108e9cefc44cf WORKDIR /dl ADD --checksum=sha256:$CMAKE_SHA256 \ https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION.tar.gz ./ diff --git a/src/README.md b/src/README.md index 9978aeb..d456d9c 100644 --- a/src/README.md +++ b/src/README.md @@ -13,8 +13,8 @@ at it from inside an unpacked source tree, with `--quiltrc` selecting the shared settings in `quiltrc` so that everyone produces identical patches: $ W=/path/to/w64devkit - $ tar xf $W/source/cmake-4.4.3.tar.gz - $ cd cmake-4.4.3/ + $ tar xf $W/source/cmake-4.4.4.tar.gz + $ cd cmake-4.4.4/ $ export QUILT_PATCHES=$W/src/cmake $ quilt --quiltrc $W/src/quiltrc push -a diff --git a/src/cmake/force-ninja.patch b/src/cmake/force-ninja.patch index 82ea7fc..bc29e97 100644 --- a/src/cmake/force-ninja.patch +++ b/src/cmake/force-ninja.patch @@ -1,8 +1,16 @@ Default to Ninja even if Visual Studio is installed. +--- + Source/cmake.cxx | 1 + + 1 file changed, 1 insertion(+) + --- a/Source/cmake.cxx +++ b/Source/cmake.cxx -@@ -2818,2 +2818,3 @@ std::unique_ptr cmake::EvaluateDefaultGlobalGenerator() +@@ -2897,6 +2897,7 @@ + } + } #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(CMAKE_BOOT_MINGW) + return cm::make_unique(this); std::string found; + // Try to find the newest VS installed on the computer and + // use that as a default if -G is not specified