Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-21 20:55:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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:
Ralf W. Grosse-Kunstleve 2023-02-16 07:54:57 -08:00 committed by GitHub
parent 535f81a1c0
commit 08a4a47a6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -83,9 +83,6 @@ jobs:
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.13 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 - name: Cache wheels
if: runner.os == 'macOS' if: runner.os == 'macOS'
@ -1074,9 +1071,6 @@ jobs:
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.13 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 - name: Run pip installs
run: | run: |

8
tools/FindCatch.cmake
View File

@ -36,10 +36,14 @@ endfunction()
function(_download_catch version destination_dir) function(_download_catch version destination_dir)
message(STATUS "Downloading catch v${version}...") message(STATUS "Downloading catch v${version}...")
set(url https://github.com/philsquared/Catch/releases/download/v${version}/catch.hpp) 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) list(GET status 0 error)
if(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() endif()
set(CATCH_INCLUDE_DIR set(CATCH_INCLUDE_DIR
"${destination_dir}" "${destination_dir}"