Find GTest via CONFIG mode to reference gmock (#640)

CMakeLists.txt

@@ -181,17 +181,21 @@ if(BUILD_TESTING)
         ${CMAKE_BINARY_DIR}/lib/libgmock.a)
   elseif(WIN32)
     # Make sure we are always bootsrapped with vcpkg on Windows
-    find_package(GTest)
-    if(NOT GTEST_FOUND)
+    find_package(GTest CONFIG)
+    if(NOT GTest_FOUND)
       install_windows_deps()
-      find_package(GTest REQUIRED)
+      find_package(GTest CONFIG REQUIRED)
     endif()
+    set(GTEST_BOTH_LIBRARIES GTest::gtest GTest::gtest_main GTest::gmock)
   else()
     # Prefer GTest installed by OS distro, brew or vcpkg package manager
-    find_package(GTest REQUIRED)
+    find_package(GTest CONFIG REQUIRED)
+    set(GTEST_BOTH_LIBRARIES GTest::gtest GTest::gtest_main GTest::gmock)
+  endif()
+  if(GTEST_INCLUDE_DIRS)
+    include_directories(SYSTEM ${GTEST_INCLUDE_DIRS})
+    message("GTEST_INCLUDE_DIRS   = ${GTEST_INCLUDE_DIRS}")
   endif()
-  include_directories(SYSTEM ${GTEST_INCLUDE_DIRS})
-  message("GTEST_INCLUDE_DIRS   = ${GTEST_INCLUDE_DIRS}")
   message("GTEST_BOTH_LIBRARIES = ${GTEST_BOTH_LIBRARIES}")
   enable_testing()
   # Benchmark respects the CMAKE_PREFIX_PATH

exporters/otlp/CMakeLists.txt

@@ -33,27 +33,12 @@ if(BUILD_TESTING)
     TARGET recordable_test
     TEST_PREFIX exporter.otlp.
     TEST_LIST recordable_test)
-  if(MSVC)
-    add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
-  endif()
-  if(MSVC AND CMAKE_BUILD_TYPE STREQUAL "Debug")
-    find_library(GMOCK_LIB gmockd PATH_SUFFIXES lib)
-  else()
-    find_library(GMOCK_LIB gmock PATH_SUFFIXES lib)
-  endif()
-  if(GMOCK_LIB)
-    add_executable(otlp_exporter_test test/otlp_exporter_test.cc)
-    target_link_libraries(
-      otlp_exporter_test
-      ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT}
-      opentelemetry_exporter_otprotocol
-      ${GMOCK_LIB}
-      protobuf::libprotobuf
-      gRPC::grpc++)
-    gtest_add_tests(
-      TARGET otlp_exporter_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_exporter_test)
-  endif()
+  add_executable(otlp_exporter_test test/otlp_exporter_test.cc)
+  target_link_libraries(
+    otlp_exporter_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
+    opentelemetry_exporter_otprotocol protobuf::libprotobuf gRPC::grpc++)
+  gtest_add_tests(
+    TARGET otlp_exporter_test
+    TEST_PREFIX exporter.otlp.
+    TEST_LIST otlp_exporter_test)
 endif() # BUILD_TESTING