From e57fcd005d4e21b169f3e990ee43bab646ca96fd Mon Sep 17 00:00:00 2001 From: Arthur O'Dwyer Date: Wed, 18 Oct 2023 20:23:17 -0400 Subject: [PATCH] [test] test wip --- .github/workflows/build-and-run-tests.yml | 4 ++-- test/CMakeLists.txt | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-run-tests.yml b/.github/workflows/build-and-run-tests.yml index 90febe6..20ced21 100644 --- a/.github/workflows/build-and-run-tests.yml +++ b/.github/workflows/build-and-run-tests.yml @@ -47,7 +47,7 @@ jobs: cmake . -B ./build -G 'Unix Makefiles' \ -DCMAKE_CXX_STANDARD=${{ matrix.cpp_standard }} \ -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} \ - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_DOWNLOAD_GTEST=ON - name: Build (Windows) if: matrix.os == 'windows-latest' @@ -58,4 +58,4 @@ jobs: - name: Test working-directory: ${{ github.workspace }}/build run: | - make && ./bin/utest + make VERBOSE=1 && ./bin/utest diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a318486..a3169db 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,14 +1,16 @@ if ("${CMAKE_DOWNLOAD_GTEST}") - include(fetchcontent) + include(FetchContent) fetchcontent_declare( - googletest + GTest GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG f8d7d77c06936315286eb55f8de22cd23c188571 # tagged v1.14.0 ) - fetchcontent_makeavailable(googletest) + fetchcontent_makeavailable(GTest) + # find_package(GTest) +else() + find_package(GTest REQUIRED) endif() -find_package(GTest REQUIRED) set(TEST_SOURCE_FILES flat_map_test.cpp