From 350a144584fa8a59c30c2c4a852f438068ab65ed Mon Sep 17 00:00:00 2001 From: "scikit-build-app-bot[bot]" <173546081+scikit-build-app-bot[bot]@users.noreply.github.com> Date: Wed, 19 Nov 2025 20:25:19 +0000 Subject: [PATCH 1/2] [Bot] Update to CMake 4.2.0 --- CMakeUrls.cmake | 28 ++++++++++++++-------------- README.rst | 2 +- docs/index.rst | 2 +- docs/make_a_release.rst | 4 ++-- docs/update_cmake_version.rst | 12 ++++++------ pyproject.toml | 2 +- tests/test_cmake.py | 4 ++-- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/CMakeUrls.cmake b/CMakeUrls.cmake index 59af137b..1c9cd909 100644 --- a/CMakeUrls.cmake +++ b/CMakeUrls.cmake @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- # CMake sources -set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3.tar.gz") -set(unix_source_sha256 "765879a53d178bf1e1509768de4c9a672dabaa20047a9f3809571558e783be88") +set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0.tar.gz") +set(unix_source_sha256 "4104e94657d247c811cb29985405a360b78130b5d51e7f6daceb2447830bd579") -set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3.zip") -set(windows_source_sha256 "540d8d8ea74c13bf83b367373e071e73d11471c293a68a41084ae6bb02cb61a8") +set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0.zip") +set(windows_source_sha256 "86eb030b4b0df6d9d9b0f769c6e922941cf57c6200353a4e2c599cc678e7a33e") #----------------------------------------------------------------------------- # CMake binaries @@ -13,17 +13,17 @@ set(windows_source_sha256 "540d8d8ea74c13bf83b367373e071e73d11471c293a68a4108 set(linux32_binary_url "NA") # Linux 32-bit binaries not available set(linux32_binary_sha256 "NA") -set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3-linux-x86_64.tar.gz") -set(linux64_binary_sha256 "507e9c721d3a0084df30661c4731980daa18f077fdcc71f7d342a21b07b07920") +set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0-linux-x86_64.tar.gz") +set(linux64_binary_sha256 "bbcebd4c433eab3af03a8c80bb5d84e8dfc3ff8a4ab9d01547b21240c23f7c2c") -set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3-macos10.10-universal.tar.gz") -set(macos10_10_binary_sha256 "e6ab486400d51133bc577b055e9e276b121c1bbc6eb84a43c816eaeb628671bd") +set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0-macos10.10-universal.tar.gz") +set(macos10_10_binary_sha256 "0e384422648a1d76387d488044cc75fcd688d9638d77a5cad2ab38a1510d51c7") -set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3-windows-i386.zip") -set(win32_binary_sha256 "86165b662284d5c5c43478eff0470d1e9a2ea49602bad5f210e87ade68ba76cf") +set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0-windows-i386.zip") +set(win32_binary_sha256 "aaa3c5f810f2720c63e3b6b5677d0f57fdff705f85e1de2043d716421469d63b") -set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3-windows-x86_64.zip") -set(win64_binary_sha256 "010d496453fdc5d11f88dbbcc0a5e54c5db7d9e04e008f516087d9d163301d89") +set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0-windows-x86_64.zip") +set(win64_binary_sha256 "cf35a516c4f5f4646b301e51c8e24b168cc012c3b1453b8f675303b54eb0ef45") -set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3-windows-arm64.zip") -set(winarm64_binary_sha256 "4b3ec4917d0d04bf9a83d171f3be552c9214e75597893b40bd10309033265ec5") +set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0-windows-arm64.zip") +set(winarm64_binary_sha256 "9eb3e88083dda569a4086c48517f5d49bd7b505dada79075ea7cb6e2ac6e0a1e") diff --git a/README.rst b/README.rst index 2c6371dd..b56cdd5b 100644 --- a/README.rst +++ b/README.rst @@ -11,7 +11,7 @@ The suite of CMake tools were created by Kitware in response to the need for a powerful, cross-platform build environment for open-source projects such as ITK and VTK. -The CMake python wheels provide `CMake 4.1.3 `_. +The CMake python wheels provide `CMake 4.2.0 `_. Latest Release -------------- diff --git a/docs/index.rst b/docs/index.rst index 969a0119..5f1cb568 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -15,7 +15,7 @@ The suite of CMake tools were created by Kitware in response to the need for a powerful, cross-platform build environment for open-source projects such as `ITK `_ and `VTK `_. -The CMake python wheels provide `CMake 4.1.3 `_. +The CMake python wheels provide `CMake 4.2.0 `_. .. toctree:: :maxdepth: 2 diff --git a/docs/make_a_release.rst b/docs/make_a_release.rst index 1e4e1a0a..d8a80f18 100644 --- a/docs/make_a_release.rst +++ b/docs/make_a_release.rst @@ -44,8 +44,8 @@ Prerequisites .. code:: console - $ git tag --sign -m 'cmake-python-distributions 4.1.3' 4.1.3 main - $ git push origin 4.1.3 + $ git tag --sign -m 'cmake-python-distributions 4.2.0' 4.2.0 main + $ git push origin 4.2.0 .. warning:: diff --git a/docs/update_cmake_version.rst b/docs/update_cmake_version.rst index 0ef0e77f..cb5ba171 100644 --- a/docs/update_cmake_version.rst +++ b/docs/update_cmake_version.rst @@ -29,13 +29,13 @@ Classic procedure: 2. Execute `scripts/update_cmake_version.py` command line tool with the desired ``X.Y.Z`` CMake version available for download. For example:: - $ release=4.1.3 + $ release=4.2.0 $ ./scripts/update_cmake_version.py $release - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.1.3' + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.2.0' [...] - Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.1.3' - done - Updating 'CMakeUrls.cmake' with CMake version 4.1.3 - Updating 'CMakeUrls.cmake' with CMake version 4.1.3 - done + Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.2.0' - done + Updating 'CMakeUrls.cmake' with CMake version 4.2.0 + Updating 'CMakeUrls.cmake' with CMake version 4.2.0 - done Updating docs/index.rst Updating docs/index.rst - done Updating README.rst @@ -46,7 +46,7 @@ Classic procedure: 3. Create a topic named `update-to-cmake-X.Y.Z` and commit the changes. For example:: - release=4.1.3 + release=4.2.0 git switch -c update-to-cmake-$release git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_cmake.py docs/update_cmake_version.rst git commit -m "Update to CMake $release" diff --git a/pyproject.toml b/pyproject.toml index 3db89080..fb2acec7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ backend-path = ["_build_backend"] [project] name = "cmake" -version = "4.1.3" +version = "4.2.0" description = "CMake is an open-source, cross-platform family of tools designed to build, test and package software" keywords = ["CMake", "build", "c++", "fortran", "cross-platform", "cross-compilation"] readme = "README.rst" diff --git a/tests/test_cmake.py b/tests/test_cmake.py index 54dbc385..16b10713 100644 --- a/tests/test_cmake.py +++ b/tests/test_cmake.py @@ -64,7 +64,7 @@ def _get_scripts(): @all_tools def test_cmake_script(tool): - expected_version = "4.1.3" + expected_version = "4.2.0" scripts = [script for script in _get_scripts() if script.stem == tool] assert len(scripts) == 1 output = subprocess.check_output([str(scripts[0]), "--version"]).decode("ascii") @@ -72,6 +72,6 @@ def test_cmake_script(tool): def test_cmake_main(): - expected_version = "4.1.3" + expected_version = "4.2.0" output = subprocess.run([sys.executable, "-m", "cmake", "--version"], text=True, capture_output=True, check=False).stdout assert output.splitlines()[0] == f"cmake version {expected_version}" From 5962b4eda043fda0eef1303b22b6f76674c03975 Mon Sep 17 00:00:00 2001 From: mayeut Date: Thu, 20 Nov 2025 01:28:46 +0100 Subject: [PATCH 2/2] fix: use the same `-march` setting as gcc on i686 --- scripts/install-static-clang.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/install-static-clang.sh b/scripts/install-static-clang.sh index e4c603bc..bb965c42 100755 --- a/scripts/install-static-clang.sh +++ b/scripts/install-static-clang.sh @@ -48,11 +48,12 @@ case "${AUDITWHEEL_POLICY}-${AUDITWHEEL_ARCH}" in manylinux*-*) TARGET_TRIPLE=${AUDITWHEEL_ARCH}-unknown-linux-gnu;; musllinux*-*) TARGET_TRIPLE=${AUDITWHEEL_ARCH}-alpine-linux-musl;; esac -case "${AUDITWHEEL_ARCH}" in - riscv64) M_ARCH="-march=rv64gc";; - x86_64) M_ARCH="-march=x86-64";; - armv7l) M_ARCH="-march=armv7a";; - i686) M_ARCH="-march=i686";; +case "${AUDITWHEEL_POLICY}-${AUDITWHEEL_ARCH}" in + *-riscv64) M_ARCH="-march=rv64gc";; + *-x86_64) M_ARCH="-march=x86-64";; + *-armv7l) M_ARCH="-march=armv7a";; + manylinux*-i686) M_ARCH="-march=k8 -mtune=generic";; # same as gcc manylinux2014 / manylinux_2_28 + musllinux*-i686) M_ARCH="-march=pentium-m -mtune=generic";; # same as gcc musllinux_1_2 esac GCC_TRIPLE=$(gcc -dumpmachine)