CMake: use the same version of googletest as bazel. (#434)

census-instrumentation · Mar 11, 2020 · 2d0ed08 · 2d0ed08
1 parent c900c4d
commit 2d0ed08
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cmake/OpenCensusDeps.cmake b/cmake/OpenCensusDeps.cmake
@@ -16,8 +16,8 @@ include(FetchContent)
 
 FetchContent_Declare(
   googletest
-  GIT_REPOSITORY https://github.com/abseil/googletest
-  GIT_TAG ed2fe122f8dc9aca844d724986d1d5cf5b65ea4e)
+  GIT_REPOSITORY https://github.com/google/googletest
+  GIT_TAG master)
 FetchContent_Declare(
   abseil
   GIT_REPOSITORY https://github.com/abseil/abseil-cpp
@@ -57,8 +57,11 @@ endif()
 FetchContent_GetProperties(abseil)
 if(NOT abseil_POPULATED)
   message(STATUS "Dependency: abseil")
+  set(orig_BUILD_TESTING "${BUILD_TESTING}")
+  set(BUILD_TESTING OFF) # Don't include abseil tests.
   FetchContent_Populate(abseil)
   add_subdirectory(${abseil_SOURCE_DIR} ${abseil_BINARY_DIR} EXCLUDE_FROM_ALL)
+  set(BUILD_TESTING "${orig_BUILD_TESTING}") # Restore value.
 endif()
 
 FetchContent_GetProperties(prometheus)

diff --git a/tools/travis/build_cmake.sh b/tools/travis/build_cmake.sh
@@ -17,7 +17,7 @@ set -x
 
 ccache -s
 ccache -z
-cmake -H. -B.build
+cmake -H. -B.build -DCMAKE_CXX_FLAGS=-Wno-unused-command-line-argument
 cmake --build .build
 (cd .build && ctest --output-on-failure)
 ccache -s