tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From b9206d360c19412d185263795d67c884feab281a Mon Sep 17 00:00:00 2001
2From: Tobias Mayer <tobim@fastmail.fm>
3Date: Mon, 29 Jul 2024 07:26:50 +0200
4Subject: [PATCH] Use nixpkgs gtest
5
6---
7 test/CMakeLists.txt | 24 ++++++------------------
8 1 file changed, 6 insertions(+), 18 deletions(-)
9
10diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
11index 11c1b04c..3d02d475 100644
12--- a/test/CMakeLists.txt
13+++ b/test/CMakeLists.txt
14@@ -1,20 +1,8 @@
15-find_package(GTestSrc)
16+find_package(GTest REQUIRED)
17+enable_testing()
18
19-IF(GTESTSRC_FOUND)
20- enable_testing()
21+set(TEST_LIBRARIES GTest::gtest GTest::gtest_main)
22
23- if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW))
24- set(gtest_disable_pthreads ON)
25- set(gtest_force_shared_crt ON)
26- endif()
27-
28- add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest)
29- include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
30-
31- set(TEST_LIBRARIES gtest gtest_main)
32-
33- add_custom_target(tests ALL)
34- add_subdirectory(perftest)
35- add_subdirectory(unittest)
36-
37-ENDIF(GTESTSRC_FOUND)
38+add_custom_target(tests ALL)
39+add_subdirectory(perftest)
40+add_subdirectory(unittest)
41--
422.45.2
43