Skip to content

Commit 9ed0c3b

Browse files
committed
WIP: changed googletest install approach
1 parent 1687377 commit 9ed0c3b

File tree

3 files changed

+9
-53
lines changed

3 files changed

+9
-53
lines changed

CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
88
set(CMAKE_CXX_STANDARD 14)
99
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1010

11+
include(FetchContent)
12+
FetchContent_Declare(
13+
googletest
14+
URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
15+
)
16+
FetchContent_MakeAvailable(googletest)
1117

1218
find_package(cifuzz NO_SYSTEM_ENVIRONMENT_PATH)
1319
enable_testing()
20+
include(GoogleTest)
1421
enable_fuzz_testing()
15-
# External dependencies
16-
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/external)
17-
include(googletest)
18-
19-
2022

2123
add_subdirectory(src/simple_examples)
2224
add_subdirectory(src/state_example)

cmake/external/googletest.cmake

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/simple_examples/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,18 @@ foreach(TestType IN ITEMS
3333

3434
target_link_libraries(${TestType}_test
3535
explore_me
36-
${GTEST_BOTH_LIBRARIES}
36+
GTest::gtest_main
3737
)
3838

39-
add_test(explore_me.${TestType} ${TestType}_test)
39+
gtest_discover_tests(${TestType}_test)
4040

4141
add_fuzz_test(${TestType}_fuzz_test
4242
${TestType}_test.cpp
4343
TEST_FRAMEWORK
4444
GTEST
45-
TEST_FRAMEWORK_LIBS
46-
${GTEST_BOTH_LIBRARIES}
4745
)
4846

4947
target_link_libraries(${TestType}_fuzz_test
5048
explore_me
51-
${GTEST_BOTH_LIBRARIES}
5249
)
5350
endforeach(TestType )

0 commit comments

Comments
 (0)