[Bot] Update to CMake 4.1.0 (#626)

* [Bot] Update to CMake 4.1.0

* fix: don't test 64-bit time when not available

* fix: skip CompilerId tests on manylinux_2_31_armv7l

Architecture ID is not detected properly for gfortran on Ubuntu 20.04 armhf

---------

Co-authored-by: scikit-build-app-bot[bot] <173546081+scikit-build-app-bot[bot]@users.noreply.github.com>
Co-authored-by: mayeut <[email protected]>

Author: scikit-build-app-bot[bot]

CMakeLists.txt

@@ -189,8 +189,11 @@ if(CMakePythonDistributions_SUPERBUILD)
     #
     if(NOT DEFINED CMakeProject_BINARY_DIR)
 
-      # glibc check
+      # cmake cache arguments
+      set(_cmake_cache_args)
+
       if(UNIX AND NOT APPLE)
+        # glibc check
         # as of CMake 3.23.0, the minimum supported version of libuv is 1.28.0.
         # this implies that the minimum supported glibc version is 2.12
         # https://github.com/libuv/libuv/blob/v1.x/SUPPORTED_PLATFORMS.md
@@ -206,10 +209,25 @@ if(CMakePythonDistributions_SUPERBUILD)
             message(FATAL_ERROR "GLIBC ${GLIBC_MAJOR}.${GLIBC_MINOR} not supported")
           endif()
         endif()
+
+        # Y2K38 support
+        include(CMakePushCheckState)
+        cmake_push_check_state(RESET)
+        set(CMAKE_REQUIRED_DEFINITIONS -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64)
+        set(CMAKE_EXTRA_INCLUDE_FILES "time.h")
+        include(CheckTypeSize)
+        check_type_size(time_t SIZEOF_TIME_T LANGUAGE CXX)
+        cmake_pop_check_state()
+        if(HAVE_SIZEOF_TIME_T)
+          if(SIZEOF_TIME_T LESS 8)
+            list(APPEND _cmake_cache_args
+              -DCMake_TEST_NO_64BIT_TIME:BOOL=TRUE
+              )
+            message(STATUS "SuperBuild -   CMakeProject-build - 64-bit time tests disabled")
+          endif()
+        endif()
       endif()
 
-      # cmake cache arguments
-      set(_cmake_cache_args)
       if(DEFINED CMAKE_BUILD_TYPE)
         list(APPEND _cmake_cache_args
           -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}

CMakeUrls.cmake

@@ -1,29 +1,29 @@
 
 #-----------------------------------------------------------------------------
 # CMake sources
-set(unix_source_url          "https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3.tar.gz")
-set(unix_source_sha256       "8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb")
+set(unix_source_url          "https://github.com/Kitware/CMake/releases/download/v4.1.0/cmake-4.1.0.tar.gz")
+set(unix_source_sha256       "81ee8170028865581a8e10eaf055afb620fa4baa0beb6387241241a975033508")
 
-set(windows_source_url       "https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3.zip")
-set(windows_source_sha256    "398c49dfe07aa9bfce0f9c0ab29d1492046b9ea8ed28a54e298fc35ca63e0b65")
+set(windows_source_url       "https://github.com/Kitware/CMake/releases/download/v4.1.0/cmake-4.1.0.zip")
+set(windows_source_sha256    "6b64d0aae3af85b775ee5a584b6f4083c1568f46afa266beec430a5a65eb21a6")
 
 #-----------------------------------------------------------------------------
 # CMake binaries
 
 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.0.3/cmake-4.0.3-linux-x86_64.tar.gz")
-set(linux64_binary_sha256    "585ae9e013107bc8e7c7c9ce872cbdcbdff569e675b07ef57aacfb88c886faac")
+set(linux64_binary_url       "https://github.com/Kitware/CMake/releases/download/v4.1.0/cmake-4.1.0-linux-x86_64.tar.gz")
+set(linux64_binary_sha256    "2637dab096e65c7d011ca0504fc0c563f8ffb531919754156ddec4b7a2f8584d")
 
-set(macos10_10_binary_url    "https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3-macos10.10-universal.tar.gz")
-set(macos10_10_binary_sha256 "31f1d30f47ce1ac25168a70635c2a9160a1a7b54b28f7efac8e8d3c9154add45")
+set(macos10_10_binary_url    "https://github.com/Kitware/CMake/releases/download/v4.1.0/cmake-4.1.0-macos10.10-universal.tar.gz")
+set(macos10_10_binary_sha256 "405b6860e7a1f8a1438b49c432739bc9c6c42634d6a06fbc722705b2f34d3b02")
 
-set(win32_binary_url         "https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3-windows-i386.zip")
-set(win32_binary_sha256      "9f71df30cf0194f7214d135afb277017bd4a58baba2ae14e6ae8b0533b5a3dbf")
+set(win32_binary_url         "https://github.com/Kitware/CMake/releases/download/v4.1.0/cmake-4.1.0-windows-i386.zip")
+set(win32_binary_sha256      "8f204250a3df83fa2e46cceae9e4077ba3032cf3b36f86ea5c97485cecc51f4d")
 
-set(win64_binary_url         "https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3-windows-x86_64.zip")
-set(win64_binary_sha256      "b59a31dfbfa376a4aaea9ff560ff2b29f78ee5f9fb15447fc71ae7bf9fea9379")
+set(win64_binary_url         "https://github.com/Kitware/CMake/releases/download/v4.1.0/cmake-4.1.0-windows-x86_64.zip")
+set(win64_binary_sha256      "5c09d23786daa89ac433a1a8237f2bdee9f420fb0f2b8a9aded7894d532c0076")
 
-set(winarm64_binary_url      "https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3-windows-arm64.zip")
-set(winarm64_binary_sha256   "86ccd6485bbd4bb41a1a858db397be5bca5e0de96858bf8dbba7a64407bd6c00")
+set(winarm64_binary_url      "https://github.com/Kitware/CMake/releases/download/v4.1.0/cmake-4.1.0-windows-arm64.zip")
+set(winarm64_binary_sha256   "a41bc485de4d17f213e127d43a22d010eb180dfb004d15e6fc9b15662d432c06")

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.0.3 <https://cmake.org/cmake/help/v4.0/index.html>`_.
+The CMake python wheels provide `CMake 4.1.0 <https://cmake.org/cmake/help/v4.1/index.html>`_.
 
 Latest Release
 --------------

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 <https://itk.org>`_ and `VTK <https://vtk.org>`_.
 
-The CMake python wheels provide `CMake 4.0.3 <https://cmake.org/cmake/help/v4.0/index.html>`_.
+The CMake python wheels provide `CMake 4.1.0 <https://cmake.org/cmake/help/v4.1/index.html>`_.
 
 .. toctree::
    :maxdepth: 2

docs/make_a_release.rst

@@ -44,8 +44,8 @@ Prerequisites
 
   .. code:: console
 
-    $ git tag --sign -m 'cmake-python-distributions 4.0.3' 4.0.3 main
-    $ git push origin 4.0.3
+    $ git tag --sign -m 'cmake-python-distributions 4.1.0' 4.1.0 main
+    $ git push origin 4.1.0
 
   .. warning::
 

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.0.3
+    $ release=4.1.0
     $ ./scripts/update_cmake_version.py $release
-    Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.0.3'
+    Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.1.0'
     [...]
-    Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.0.3' - done
-    Updating 'CMakeUrls.cmake' with CMake version 4.0.3
-    Updating 'CMakeUrls.cmake' with CMake version 4.0.3 - done
+    Collecting URLs and SHA256s from 'https://api.github.com/repos/Kitware/CMake/releases/tags/v4.1.0' - done
+    Updating 'CMakeUrls.cmake' with CMake version 4.1.0
+    Updating 'CMakeUrls.cmake' with CMake version 4.1.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.0.3
+    release=4.1.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"

pyproject.toml

@@ -5,7 +5,7 @@ backend-path = ["_build_backend"]
 
 [project]
 name = "cmake"
-version = "4.0.3"
+version = "4.1.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"
@@ -131,6 +131,13 @@ config-settings."cmake.define.CMAKE_JOB_POOL_COMPILE" = "compile"
 config-settings."cmake.define.CMAKE_JOB_POOL_LINK" = "link"
 config-settings."cmake.define.CMAKE_JOB_POOLS" = "compile=4;link=1"
 
+[[tool.cibuildwheel.overrides]]
+select = ["*-manylinux_armv7l"]
+inherit.config-settings = "append"
+# disable some tests
+# - RunCMake.CompilerId fails because architecture id is not detected properly for gfortran on Ubuntu 20.04 https://gitlab.kitware.com/cmake/cmake/-/issues/27129
+config-settings."cmake.define.RUN_CMAKE_TEST_EXCLUDE" = "RunCMake.CompilerId"
+
 [[tool.cibuildwheel.overrides]]
 select = ["*-musllinux_*"]
 inherit.config-settings = "append"

tests/test_cmake.py

@@ -64,14 +64,14 @@ def _get_scripts():
 
 @all_tools
 def test_cmake_script(tool):
-    expected_version = "4.0.3"
+    expected_version = "4.1.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")
     assert output.splitlines()[0] == f"{tool} version {expected_version}"
 
 
 def test_cmake_main():
-    expected_version = "4.0.3"
+    expected_version = "4.1.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}"