mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-01 13:14:42 +00:00
53 lines
1.4 KiB
Diff
53 lines
1.4 KiB
Diff
From 0cfacb99db5940dabc385e7bc4534dfefa60fcfd Mon Sep 17 00:00:00 2001
|
|
From: fliiiix <hi@l33t.name>
|
|
Date: Thu, 25 Jun 2026 10:46:35 +0200
|
|
Subject: [PATCH] cpm
|
|
|
|
---
|
|
CMakeLists.txt | 4 ----
|
|
tests/CMakeLists.txt | 11 +----------
|
|
2 files changed, 1 insertion(+), 14 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 51fade9b4..1b93bffd2 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -60,10 +60,6 @@ option(CROW_ENABLE_SSL "Enable Crow's SSL feature for supporting https" OFF)
|
|
option(CROW_ENABLE_COMPRESSION "Enable Crow's Compression feature for supporting compressed http content" OFF)
|
|
option(CROW_ENABLE_TSAN "Enable ThreadSanitizer" OFF)
|
|
|
|
-if(CROW_GENERATE_SBOM OR CROW_BUILD_TESTS)
|
|
- include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake)
|
|
-endif ()
|
|
-
|
|
if(CROW_GENERATE_SBOM)
|
|
CPMAddPackage(
|
|
NAME cmake-sbom
|
|
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
|
index 80f6dd364..e01adeb2f 100644
|
|
--- a/tests/CMakeLists.txt
|
|
+++ b/tests/CMakeLists.txt
|
|
@@ -5,18 +5,9 @@ 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)
|
|
|
|
+find_package(Catch2 REQUIRED)
|
|
|
|
-CPMAddPackage(Catch2
|
|
- VERSION 3.12.0
|
|
- GITHUB_REPOSITORY catchorg/Catch2
|
|
- OPTIONS
|
|
- "CATCH_INSTALL_DOCS Off"
|
|
- "CATCH_INSTALL_EXTRAS Off"
|
|
- "CATCH_ENABLE_REPRODUCIBLE_BUILD Off"
|
|
-)
|
|
-
|
|
enable_testing()
|
|
|
|
# list the test sources
|
|
--
|
|
2.43.0
|
|
|