| Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 1 | From 93557d5c5acf9ebb2c0fa708658e1d36621dd23a Mon Sep 17 00:00:00 2001 |
| 2 | From: Wang Mingyu <wangmy@fujitsu.com> |
| 3 | Date: Wed, 7 Sep 2022 10:05:15 +0900 |
| 4 | Subject: [PATCH] Do not download the catch framework during configure. |
| 5 | |
| 6 | Upstream-Status: Inappropriate [configuration] |
| 7 | |
| 8 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> |
| 9 | --- |
| 10 | tests/CMakeLists.txt | 15 --------------- |
| 11 | 1 file changed, 15 deletions(-) |
| 12 | |
| 13 | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt |
| 14 | index 80c4f6a..ae210db 100644 |
| 15 | --- a/tests/CMakeLists.txt |
| 16 | +++ b/tests/CMakeLists.txt |
| 17 | @@ -74,21 +74,6 @@ if(Catch2_FOUND) |
| 18 | endif() |
| 19 | message(STATUS "Found Catch2") |
| 20 | target_link_libraries(catch_main PUBLIC Catch2::Catch2) |
| 21 | -else() |
| 22 | - message(STATUS "Downloading Catch2") |
| 23 | - |
| 24 | - # FetchContent would be better, but requires newer CMake. |
| 25 | - file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/catch2") |
| 26 | - set(url https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp) |
| 27 | - file( |
| 28 | - DOWNLOAD ${url} "${CMAKE_CURRENT_BINARY_DIR}/catch2/catch.hpp" |
| 29 | - STATUS status |
| 30 | - EXPECTED_HASH SHA256=ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc) |
| 31 | - list(GET status 0 error) |
| 32 | - if(error) |
| 33 | - message(FATAL_ERROR "Could not download ${url}, and Catch2 not found on your system.") |
| 34 | - endif() |
| 35 | - target_include_directories(catch_main PUBLIC "${CMAKE_CURRENT_BINARY_DIR}") |
| 36 | endif() |
| 37 | |
| 38 | # Target must already exist |
| 39 | -- |
| 40 | 2.25.1 |
| 41 | |