Revert "Go back to CMake 3.25.2 (pybind#4496)" (pybind#4503)

* Revert "Go back to CMake 3.25.2 (pybind#4496)"

This reverts commit b8f2855.

* Apply patch provided by @bradking (with pre-commit cmake-format auto fixes).

pybind#4503 (comment)

Author: rwgk

.github/workflows/ci.yml

@@ -83,9 +83,6 @@ jobs:
 
     - name: Update CMake
       uses: jwlawson/[email protected]
-      # TEMPORARILY pin version because 3.26.0-rc1 is failing under macOS:
-      with:
-        cmake-version: '3.25.2'
 
     - name: Cache wheels
       if: runner.os == 'macOS'
@@ -1074,9 +1071,6 @@ jobs:
 
       - name: Update CMake
         uses: jwlawson/[email protected]
-        # TEMPORARILY pin version because 3.26.0-rc1 is failing under macOS:
-        with:
-          cmake-version: '3.25.2'
 
       - name: Run pip installs
         run: |

tools/FindCatch.cmake

@@ -36,10 +36,14 @@ endfunction()
 function(_download_catch version destination_dir)
   message(STATUS "Downloading catch v${version}...")
   set(url https://github.com/philsquared/Catch/releases/download/v${version}/catch.hpp)
-  file(DOWNLOAD ${url} "${destination_dir}/catch.hpp" STATUS status)
+  file(
+    DOWNLOAD ${url} "${destination_dir}/catch.hpp"
+    STATUS status
+    LOG log)
   list(GET status 0 error)
   if(error)
-    message(FATAL_ERROR "Could not download ${url}")
+    string(REPLACE "\n" "\n  " log "  ${log}")
+    message(FATAL_ERROR "Could not download URL:\n" "  ${url}\n" "Log:\n" "${log}")
   endif()
   set(CATCH_INCLUDE_DIR
       "${destination_dir}"