Remove gmock dependency

Author: mcbarton

cmake/modules/GoogleTest.cmake

@@ -3,8 +3,6 @@ set(_gtest_byproduct_binary_dir
 set(_gtest_byproducts
   ${_gtest_byproduct_binary_dir}/lib/libgtest.a
   ${_gtest_byproduct_binary_dir}/lib/libgtest_main.a
-  ${_gtest_byproduct_binary_dir}/lib/libgmock.a
-  ${_gtest_byproduct_binary_dir}/lib/libgmock_main.a
   )
 
 if(WIN32)
@@ -73,12 +71,11 @@ ExternalProject_Add(
   TIMEOUT 600
   )
 
-# Specify include dirs for gtest and gmock
+# Specify include dirs for gtest
 ExternalProject_Get_Property(googletest source_dir)
 set(GTEST_INCLUDE_DIR ${source_dir}/googletest/include)
-set(GMOCK_INCLUDE_DIR ${source_dir}/googlemock/include)
 # Create the directories. Prevents bug https://gitlab.kitware.com/cmake/cmake/issues/15052
-file(MAKE_DIRECTORY ${GTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR})
+file(MAKE_DIRECTORY ${GTEST_INCLUDE_DIR})
 
 # Libraries
 ExternalProject_Get_Property(googletest binary_dir)
@@ -88,9 +85,8 @@ else()
   set(_G_LIBRARY_PATH ${binary_dir}/lib/)
 endif()
 
-# Use gmock_main instead of gtest_main because it initializes gtest as well.
 # Note: The libraries are listed in reverse order of their dependencies.
-foreach(lib gtest gtest_main gmock gmock_main)
+foreach(lib gtest gtest_main)
   add_library(${lib} IMPORTED STATIC GLOBAL)
   set_target_properties(${lib} PROPERTIES
     IMPORTED_LOCATION "${_G_LIBRARY_PATH}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}"
@@ -103,9 +99,6 @@ foreach(lib gtest gtest_main gmock gmock_main)
   endif()
 endforeach()
 target_include_directories(gtest INTERFACE ${GTEST_INCLUDE_DIR})
-target_include_directories(gmock INTERFACE ${GMOCK_INCLUDE_DIR})
 
 set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX})
 set_property(TARGET gtest_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX})
-set_property(TARGET gmock PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX})
-set_property(TARGET gmock_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX})

unittests/CMakeLists.txt

@@ -10,16 +10,16 @@ endif()
 if(EMSCRIPTEN)
   if (TARGET GTest::gtest)
     # Target names in CMake >= v3.23
-    set(gtest_libs GTest::gtest GTest::gmock)
+    set(gtest_libs GTest::gtest)
   else()
-    set(gtest_libs gtest gmock)
+    set(gtest_libs gtest)
   endif()
 else()
   if (TARGET GTest::gtest)
     # Target names in CMake >= v3.23
-    set(gtest_libs GTest::gtest GTest::gmock GTest::gtest_main)
+    set(gtest_libs GTest::gtest GTest::gtest_main)
   else()
-    set(gtest_libs gtest gtest_main gmock)
+    set(gtest_libs gtest gtest_main)
   endif()
   set(link_pthreads_lib pthread)
 endif()

unittests/CppInterOp/InterpreterTest.cpp

@@ -20,15 +20,13 @@
 #include "llvm/Support/Path.h"
 #include <llvm/Support/FileSystem.h>
 
-#include <gmock/gmock.h>
 #include "gtest/gtest.h"
 
 #include <algorithm>
 
-using ::testing::StartsWith;
-
 TEST(InterpreterTest, Version) {
-  EXPECT_THAT(Cpp::GetVersion(), StartsWith("CppInterOp version"));
+  std::string version = Cpp::GetVersion();
+  EXPECT_TRUE(version.rfind("CppInterOp version", 0) == 0);
 }
 
 #ifdef NDEBUG