Skip to content

Commit e480365

Browse files
committed
FIX: Fix gmock
1 parent 3440981 commit e480365

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ jobs:
3232
-DHAVE_RULES=ON
3333
cmake --build build --config Release --parallel
3434
sudo cmake --install build --prefix /usr
35-
- name: Install gtest
36-
uses: MarkusJx/[email protected]
3735
- name: CMake configure
3836
run: |
3937
cmake -S . -B build \
4038
-GNinja \
4139
-DCMAKE_CXX_COMPILER=${{ matrix.compiler }} \
40+
-DDATABENTO_USE_EXTERNAL_GTEST=0 \
4241
-DDATABENTO_ENABLE_UNIT_TESTING=1 \
4342
-DDATABENTO_ENABLE_EXAMPLES=1 \
4443
-DDATABENTO_ENABLE_CLANG_TIDY=1 \

tests/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,15 @@ else()
129129
# DOWNLOAD_EXTRACT_TIMESTAMP added in 3.24
130130
FetchContent_Declare(
131131
googletest
132-
URL https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz
132+
URL https://github.com/google/googletest/releases/download/v1.17.0/googletest-1.17.0.tar.gz
133133
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
134134
)
135135
endif()
136136
FetchContent_MakeAvailable(googletest)
137137
target_link_libraries(
138138
${PROJECT_NAME}
139139
PUBLIC
140-
gtest
141-
gtest_main
140+
gmock_main
142141
${${CMAKE_PROJECT_NAME}_TEST_LIB}
143142
)
144143
# Ignore compiler warnings in headers

0 commit comments

Comments
 (0)