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}"