Skip to content

Commit ed68126

Browse files
committed
Cleanup GMock usage
1 parent 4be5543 commit ed68126

File tree

4 files changed

+6
-16
lines changed

4 files changed

+6
-16
lines changed

Diff for: CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ if(NOT PROJECT_IS_TOP_LEVEL)
109109
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" PARENT_SCOPE)
110110
endif()
111111

112-
include(cmake/gmock.cmake)
113112
if(PROJECT_IS_TOP_LEVEL)
114113
include(cmake/warnings.cmake)
115114
endif()

Diff for: cmake/gmock.cmake

-13
This file was deleted.

Diff for: config.h.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,4 @@
1414
#cmakedefine CPPUTEST_STD_C_LIB_DISABLED
1515
#cmakedefine CPPUTEST_STD_CPP_LIB_DISABLED
1616

17-
#cmakedefine INCLUDE_GTEST_TESTS
18-
1917
#endif

Diff for: tests/CppUTestExt/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ if(CPPUTEST_STD_C_LIB_DISABLED)
3636
)
3737
endif()
3838

39+
find_package(GTest)
40+
if(GTEST_FOUND)
41+
target_compile_definitions(CppUTestExtTests PRIVATE INCLUDE_GTEST_TESTS)
42+
target_link_libraries(CppUTestExtTests PRIVATE ${GTEST_LIBRARIES})
43+
endif()
44+
3945
if(MINGW)
4046
set(THREADS_PREFER_PTHREAD_FLAG ON)
4147
find_package(Threads)

0 commit comments

Comments
 (0)