From 9c868601591b60cf066eb576e85b0dbf4e1fd7ae Mon Sep 17 00:00:00 2001 From: HampusM Date: Sat, 25 Jun 2022 16:20:51 +0200 Subject: test: replace gtest with Catch2 & Trompeloeil --- lib/CMakeLists.txt | 16 ++++++++++++---- lib/catch2/CMakeLists.txt | 4 ++++ lib/gtest/CMakeLists.txt | 4 ---- lib/trompeloeil/CMakeLists.txt | 4 ++++ 4 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 lib/catch2/CMakeLists.txt delete mode 100644 lib/gtest/CMakeLists.txt create mode 100644 lib/trompeloeil/CMakeLists.txt (limited to 'lib') diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 6a5d90d..4e2b318 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -43,10 +43,18 @@ add_subdirectory(backward) if(test) FetchContent_Declare( - gtest - GIT_REPOSITORY "https://github.com/google/googletest" - GIT_TAG v1.11.0 + catch2 + GIT_REPOSITORY "https://github.com/catchorg/Catch2" + GIT_TAG v3.0.1 ) - add_subdirectory(gtest) + add_subdirectory(catch2) + + FetchContent_Declare( + trompeloeil + GIT_REPOSITORY "https://github.com/rollbear/trompeloeil" + GIT_TAG v42 + ) + + add_subdirectory(trompeloeil) endif() diff --git a/lib/catch2/CMakeLists.txt b/lib/catch2/CMakeLists.txt new file mode 100644 index 0000000..f9f75e4 --- /dev/null +++ b/lib/catch2/CMakeLists.txt @@ -0,0 +1,4 @@ +message(STATUS "Fetching Catch2...") + +FetchContent_MakeAvailable(catch2) + diff --git a/lib/gtest/CMakeLists.txt b/lib/gtest/CMakeLists.txt deleted file mode 100644 index f28b693..0000000 --- a/lib/gtest/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -message(STATUS "Fetching gtest...") - -FetchContent_MakeAvailable(gtest) - diff --git a/lib/trompeloeil/CMakeLists.txt b/lib/trompeloeil/CMakeLists.txt new file mode 100644 index 0000000..dc3f2e5 --- /dev/null +++ b/lib/trompeloeil/CMakeLists.txt @@ -0,0 +1,4 @@ +message(STATUS "Fetching Trompeloeil...") + +FetchContent_MakeAvailable(trompeloeil) + -- cgit v1.2.3-18-g5258