Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henryiii merged 2 commits into from
Feb 16, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fee7d86
Revert "Go back to CMake 3.25.2 (#4496)"
rwgk Feb 8, 2023
08bf54c
Apply patch provided by @bradking (with pre-commit cmake-format auto …
rwgk Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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: |
Expand Down
8 changes: 6 additions & 2 deletions tools/FindCatch.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down