Skip to content

Commit 091357e

Browse files
authored
Update to CMake 3.29.0 (#467)
* Update to CMake 3.29.0 * tests: skip musl failing test * tests: exclude new failing test on MUSL Signed-off-by: Henry Schreiner <[email protected]> --------- Signed-off-by: Henry Schreiner <[email protected]>
1 parent ab6a136 commit 091357e

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
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/v3.28.3/cmake-3.28.3.tar.gz")
5-
set(unix_source_sha256 "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1")
4+
set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0.tar.gz")
5+
set(unix_source_sha256 "a0669630aae7baa4a8228048bf30b622f9e9fd8ee8cedb941754e9e38686c778")
66

7-
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3.zip")
8-
set(windows_source_sha256 "b54943b9c98ac66061e9b97fd630b3f06a75a85143a561ef2dca88aa0e042c60")
7+
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0.zip")
8+
set(windows_source_sha256 "6add9cf8a50785092d0e3d7e9e49c9812f76653b94d1b49384d6079700d42e4e")
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/v3.28.3/cmake-3.28.3-linux-x86_64.tar.gz")
17-
set(linux64_binary_sha256 "804d231460ab3c8b556a42d2660af4ac7a0e21c98a7f8ee3318a74b4a9a187a6")
16+
set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0-linux-x86_64.tar.gz")
17+
set(linux64_binary_sha256 "f06258f52c5649752dfb10c4c2e1d8167c760c8826f078c6f5c332fa9d976bf8")
1818

19-
set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-macos10.10-universal.tar.gz")
20-
set(macos10_10_binary_sha256 "5541339751cb96d1b03eb3244df7e750cd4e1dcb361ebbd68a179493dfccc5bf")
19+
set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0-macos10.10-universal.tar.gz")
20+
set(macos10_10_binary_sha256 "868f356c56a3c35e8f39f0d4fb7e579cb2eb0ac06c26520d6a203d91bdc7ad09")
2121

22-
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-windows-i386.zip")
23-
set(win32_binary_sha256 "411812b6b29ac793faf69bdbd36c612f72659363c5491b9f0a478915db3fc58c")
22+
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0-windows-i386.zip")
23+
set(win32_binary_sha256 "db687afa0b1d0e0c5a2641b31fab050b5e2c044189b6f022ea5a09adba6cf4f5")
2424

25-
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-windows-x86_64.zip")
26-
set(win64_binary_sha256 "cac7916f7e1e73a25de857704c94fd5b72ba9fe2f055356b5602d2f960e50e5b")
25+
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0-windows-x86_64.zip")
26+
set(win64_binary_sha256 "9ab28eba1ab7911a0e57ab274f5990a283fffa1d22eb711792d5562e5869f9ef")
2727

28-
set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-windows-arm64.zip")
29-
set(winarm64_binary_sha256 "cfe023b7e82812ef802fb1ec619f6cfa2fdcb58ee61165fc315086286fe9cdcc")
28+
set(winarm64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0-windows-arm64.zip")
29+
set(winarm64_binary_sha256 "e5bea5c45b61f105429fc664364c5280acd40770cc74235b79e7422f608a9849")

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 3.28.3 <https://cmake.org/cmake/help/v3.28/index.html>`_.
14+
The CMake python wheels provide `CMake 3.29.0 <https://cmake.org/cmake/help/v3.29/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 3.28.3 <https://cmake.org/cmake/help/v3.28/index.html>`_.
18+
The CMake python wheels provide `CMake 3.29.0 <https://cmake.org/cmake/help/v3.29/index.html>`_.
1919

2020
.. toctree::
2121
:maxdepth: 2

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=3.28.3
32+
$ release=3.29.0
3333
$ ./scripts/update_cmake_version.py $release
34-
Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.28.3'
34+
Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.29.0'
3535
[...]
36-
Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.28.3' - done
37-
Updating 'CMakeUrls.cmake' with CMake version 3.28.3
38-
Updating 'CMakeUrls.cmake' with CMake version 3.28.3 - done
36+
Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v3.29.0' - done
37+
Updating 'CMakeUrls.cmake' with CMake version 3.29.0
38+
Updating 'CMakeUrls.cmake' with CMake version 3.29.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=3.28.3
49+
release=3.29.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
@@ -84,7 +84,7 @@ select = ["*-musllinux_x86_64", "*-musllinux_i686"]
8484
# disable some tests
8585
# - BootstrapTest fails with custom OpenSSL and probably does not make much sense for this project
8686
# - ExportImport|RunCMake.install|RunCMake.file-GET_RUNTIME_DEPENDENCIES: c.f. https://discourse.cmake.org/t/cmake-test-suite-failing-on-alpine-linux/5064
87-
environment = { CMAKE_ARGS = "-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link -DCMAKE_JOB_POOLS:STRING=compile=4;link=1 -DRUN_CMAKE_TEST_EXCLUDE:STRING='BootstrapTest|ExportImport|RunCMake.install|RunCMake.file-GET_RUNTIME_DEPENDENCIES'" }
87+
environment = { CMAKE_ARGS = "-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link -DCMAKE_JOB_POOLS:STRING=compile=4;link=1 -DRUN_CMAKE_TEST_EXCLUDE:STRING='BootstrapTest|ExportImport|RunCMake.install|RunCMake.RuntimePath|RunCMake.file-GET_RUNTIME_DEPENDENCIES'" }
8888

8989
[[tool.cibuildwheel.overrides]]
9090
select = ["*-musllinux_aarch64", "*-musllinux_ppc64le", "*-musllinux_s390x"]

tests/test_cmake.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def _get_scripts():
7171

7272
@all_tools
7373
def test_cmake_script(tool):
74-
expected_version = "3.28.3"
74+
expected_version = "3.29.0"
7575
scripts = [script for script in _get_scripts() if script.stem == tool]
7676
assert len(scripts) == 1
7777
output = subprocess.check_output([str(scripts[0]), "--version"]).decode("ascii")

0 commit comments

Comments
 (0)