mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-24 14:15:11 +00:00
* Revert "Go back to CMake 3.25.2 (#4496)"
This reverts commit b8f28551cc
.
* Apply patch provided by @bradking (with pre-commit cmake-format auto fixes).
https://github.com/pybind/pybind11/pull/4503#issuecomment-1424768172
This commit is contained in:
parent
535f81a1c0
commit
08a4a47a6c
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
@ -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: |
|
||||
|
@ -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}"
|
||||
|
Loading…
Reference in New Issue
Block a user