From 08a4a47a6c0a8e8ca99a86c23c9b6ac843837395 Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgk@google.com>
Date: Thu, 16 Feb 2023 07:54:57 -0800
Subject: [PATCH] Revert "Go back to CMake 3.25.2 (#4496)" (#4503)

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

This reverts commit b8f28551cc3a98ea9fbfc15c05b513c8f2d23e84.

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

https://github.com/pybind/pybind11/pull/4503#issuecomment-1424768172
---
 .github/workflows/ci.yml | 6 ------
 tools/FindCatch.cmake    | 8 ++++++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d93d42b1..8befccdbc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,9 +83,6 @@ jobs:
 
     - name: Update CMake
       uses: jwlawson/actions-setup-cmake@v1.13
-      # 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/actions-setup-cmake@v1.13
-        # TEMPORARILY pin version because 3.26.0-rc1 is failing under macOS:
-        with:
-          cmake-version: '3.25.2'
 
       - name: Run pip installs
         run: |
diff --git a/tools/FindCatch.cmake b/tools/FindCatch.cmake
index 57bba58b3..5d3fcbfb1 100644
--- a/tools/FindCatch.cmake
+++ b/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}"