From 7f9b079aff1c86e0a4972abbd0e51fd94b5c2000 Mon Sep 17 00:00:00 2001 From: Gulliver Date: Sun, 8 Sep 2024 12:05:30 +0200 Subject: [PATCH] disabled not needed catch2 options in CPMAddPackage updated Catch2 and CPM --- cmake/CPM.cmake | 4 ++-- tests/CMakeLists.txt | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index d0fd0e8ea..baf2d8c34 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -2,8 +2,8 @@ # # SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors -set(CPM_DOWNLOAD_VERSION 0.39.0) -set(CPM_HASH_SUM "66639bcac9dd2907b2918de466783554c1334446b9874e90d38e3778d404c2ef") +set(CPM_DOWNLOAD_VERSION 0.40.2) +set(CPM_HASH_SUM "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d") if(CPM_SOURCE_CACHE) set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a6d95ed59..7cee68e7a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,11 +1,22 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.21) project(crow_test) +set(CMAKE_POLICY_DEFAULT_CMP0077 new) +set(CMAKE_POLICY_WARNING_CMP0126 new) + include(${CMAKE_SOURCE_DIR}/cmake/compiler_options.cmake) include(${CMAKE_SOURCE_DIR}/cmake/CPM.cmake) -CPMAddPackage("gh:catchorg/Catch2@3.6.0") +CPMAddPackage(Catch2 + VERSION 3.7.0 + GITHUB_REPOSITORY catchorg/Catch2 + OPTIONS + "CATCH_INSTALL_DOCS Off" + "CATCH_INSTALL_EXTRAS Off" + "CATCH_ENABLE_REPRODUCIBLE_BUILD Off" +) + enable_testing() set(TEST_SRCS