Merge branch 'main' into etw-logger

open-telemetry · Oct 6, 2021 · 96daa8b · 96daa8b
2 parents 6a6c68e + 2f462a5
commit 96daa8b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt
@@ -69,7 +69,6 @@ if(BUILD_TESTING)
  # library. These flavors have different prefix on Windows, gmock and gmockd
  # respectively.
  add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
- else()
  if(GMOCK_LIB)
  # unset GMOCK_LIB to force find_library to redo the lookup, as the cached
  # entry could cause linking to incorrect flavor of gmock and leading to