Skip to content

Commit 68c75a9

Browse files
scikit-build-app-bot[bot]mayeut
scikit-build-app-bot[bot]
and
mayeut
authored
[Bot] Update to CMake 4.2.0 (#656)
* [Bot] Update to CMake 4.2.0 * fix: use the same `-march` setting as gcc on i686 --------- Co-authored-by: scikit-build-app-bot[bot] <173546081+scikit-build-app-bot[bot]@users.noreply.github.com> Co-authored-by: mayeut <mayeut@users.noreply.github.com>
1 parent c2ddf84 commit 68c75a9

File tree

8 files changed

+33
-32
lines changed

8 files changed

+33
-32
lines changed

‎CMakeUrls.cmake‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11

22
#-----------------------------------------------------------------------------
33
# CMake sources
4-
set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3.tar.gz")
5-
set(unix_source_sha256 "765879a53d178bf1e1509768de4c9a672dabaa20047a9f3809571558e783be88")
4+
set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0.tar.gz")
5+
set(unix_source_sha256 "4104e94657d247c811cb29985405a360b78130b5d51e7f6daceb2447830bd579")
66

7-
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3.zip")
8-
set(windows_source_sha256 "540d8d8ea74c13bf83b367373e071e73d11471c293a68a41084ae6bb02cb61a8")
7+
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0.zip")
8+
set(windows_source_sha256 "86eb030b4b0df6d9d9b0f769c6e922941cf57c6200353a4e2c599cc678e7a33e")
99

1010
#-----------------------------------------------------------------------------
1111
# CMake binaries
1212

1313
set(linux32_binary_url "NA") # Linux 32-bit binaries not available
1414
set(linux32_binary_sha256 "NA")
1515

16-
set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3-linux-x86_64.tar.gz")
17-
set(linux64_binary_sha256 "507e9c721d3a0084df30661c4731980daa18f077fdcc71f7d342a21b07b07920")
16+
set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0-linux-x86_64.tar.gz")
17+
set(linux64_binary_sha256 "bbcebd4c433eab3af03a8c80bb5d84e8dfc3ff8a4ab9d01547b21240c23f7c2c")
1818

19-
set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3-macos10.10-universal.tar.gz")
20-
set(macos10_10_binary_sha256 "e6ab486400d51133bc577b055e9e276b121c1bbc6eb84a43c816eaeb628671bd")
19+
set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0-macos10.10-universal.tar.gz")
20+
set(macos10_10_binary_sha256 "0e384422648a1d76387d488044cc75fcd688d9638d77a5cad2ab38a1510d51c7")
2121

22-
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3-windows-i386.zip")
23-
set(win32_binary_sha256 "86165b662284d5c5c43478eff0470d1e9a2ea49602bad5f210e87ade68ba76cf")
22+
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0-windows-i386.zip")
23+
set(win32_binary_sha256 "aaa3c5f810f2720c63e3b6b5677d0f57fdff705f85e1de2043d716421469d63b")
2424

25-
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3-windows-x86_64.zip")
26-
set(win64_binary_sha256 "010d496453fdc5d11f88dbbcc0a5e54c5db7d9e04e008f516087d9d163301d89")
25+
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0-windows-x86_64.zip")
26+
set(win64_binary_sha256 "cf35a516c4f5f4646b301e51c8e24b168cc012c3b1453b8f675303b54eb0ef45")
2727

28-
set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v4.1.3/cmake-4.1.3-windows-arm64.zip")
29-
set(winarm64_binary_sha256 "4b3ec4917d0d04bf9a83d171f3be552c9214e75597893b40bd10309033265ec5")
28+
set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0-windows-arm64.zip")
29+
set(winarm64_binary_sha256 "9eb3e88083dda569a4086c48517f5d49bd7b505dada79075ea7cb6e2ac6e0a1e")

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The suite of CMake tools were created by Kitware in response to the need
1111
for a powerful, cross-platform build environment for open-source projects
1212
such as ITK and VTK.
1313

14-
The CMake python wheels provide `CMake 4.1.3 <https://cmake.org/cmake/help/v4.1/index.html>`_.
14+
The CMake python wheels provide `CMake 4.2.0 <https://cmake.org/cmake/help/v4.2/index.html>`_.
1515

1616
Latest Release
1717
--------------

‎docs/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The suite of CMake tools were created by Kitware in response to the need
1515
for a powerful, cross-platform build environment for open-source projects
1616
such as `ITK <https://itk.org>`_ and `VTK <https://vtk.org>`_.
1717

18-
The CMake python wheels provide `CMake 4.1.3 <https://cmake.org/cmake/help/v4.1/index.html>`_.
18+
The CMake python wheels provide `CMake 4.2.0 <https://cmake.org/cmake/help/v4.2/index.html>`_.
1919

2020
.. toctree::
2121
:maxdepth: 2

‎docs/make_a_release.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ Prerequisites
4444

4545
.. code:: console
4646
47-
$ git tag --sign -m 'cmake-python-distributions 4.1.3' 4.1.3 main
48-
$ git push origin 4.1.3
47+
$ git tag --sign -m 'cmake-python-distributions 4.2.0' 4.2.0 main
48+
$ git push origin 4.2.0
4949
5050
.. warning::
5151

‎docs/update_cmake_version.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ Classic procedure:
2929
2. Execute `scripts/update_cmake_version.py` command line tool with the desired
3030
``X.Y.Z`` CMake version available for download. For example::
3131

32-
$ release=4.1.3
32+
$ release=4.2.0
3333
$ ./scripts/update_cmake_version.py $release
34-
Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.1.3'
34+
Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.2.0'
3535
[...]
36-
Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.1.3' - done
37-
Updating 'CMakeUrls.cmake' with CMake version 4.1.3
38-
Updating 'CMakeUrls.cmake' with CMake version 4.1.3 - done
36+
Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.2.0' - done
37+
Updating 'CMakeUrls.cmake' with CMake version 4.2.0
38+
Updating 'CMakeUrls.cmake' with CMake version 4.2.0 - done
3939
Updating docs/index.rst
4040
Updating docs/index.rst - done
4141
Updating README.rst
@@ -46,7 +46,7 @@ Classic procedure:
4646
3. Create a topic named `update-to-cmake-X.Y.Z` and commit the changes.
4747
For example::
4848

49-
release=4.1.3
49+
release=4.2.0
5050
git switch -c update-to-cmake-$release
5151
git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_cmake.py docs/update_cmake_version.rst
5252
git commit -m "Update to CMake $release"

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ backend-path = ["_build_backend"]
55

66
[project]
77
name = "cmake"
8-
version = "4.1.3"
8+
version = "4.2.0"
99
description = "CMake is an open-source, cross-platform family of tools designed to build, test and package software"
1010
keywords = ["CMake", "build", "c++", "fortran", "cross-platform", "cross-compilation"]
1111
readme = "README.rst"

‎scripts/install-static-clang.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@ case "${AUDITWHEEL_POLICY}-${AUDITWHEEL_ARCH}" in
4848
manylinux*-*) TARGET_TRIPLE=${AUDITWHEEL_ARCH}-unknown-linux-gnu;;
4949
musllinux*-*) TARGET_TRIPLE=${AUDITWHEEL_ARCH}-alpine-linux-musl;;
5050
esac
51-
case "${AUDITWHEEL_ARCH}" in
52-
riscv64) M_ARCH="-march=rv64gc";;
53-
x86_64) M_ARCH="-march=x86-64";;
54-
armv7l) M_ARCH="-march=armv7a";;
55-
i686) M_ARCH="-march=i686";;
51+
case "${AUDITWHEEL_POLICY}-${AUDITWHEEL_ARCH}" in
52+
*-riscv64) M_ARCH="-march=rv64gc";;
53+
*-x86_64) M_ARCH="-march=x86-64";;
54+
*-armv7l) M_ARCH="-march=armv7a";;
55+
manylinux*-i686) M_ARCH="-march=k8 -mtune=generic";; # same as gcc manylinux2014 / manylinux_2_28
56+
musllinux*-i686) M_ARCH="-march=pentium-m -mtune=generic";; # same as gcc musllinux_1_2
5657
esac
5758
GCC_TRIPLE=$(gcc -dumpmachine)
5859

‎tests/test_cmake.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ def _get_scripts():
6464

6565
@all_tools
6666
def test_cmake_script(tool):
67-
expected_version = "4.1.3"
67+
expected_version = "4.2.0"
6868
scripts = [script for script in _get_scripts() if script.stem == tool]
6969
assert len(scripts) == 1
7070
output = subprocess.check_output([str(scripts[0]), "--version"]).decode("ascii")
7171
assert output.splitlines()[0] == f"{tool} version {expected_version}"
7272

7373

7474
def test_cmake_main():
75-
expected_version = "4.1.3"
75+
expected_version = "4.2.0"
7676
output = subprocess.run([sys.executable, "-m", "cmake", "--version"], text=True, capture_output=True, check=False).stdout
7777
assert output.splitlines()[0] == f"cmake version {expected_version}"

0 commit comments

Comments
 (0)