diff --git a/cmake/gtest.cmake b/cmake/gtest.cmake index 5562380cae..cf516d6d53 100644 --- a/cmake/gtest.cmake +++ b/cmake/gtest.cmake @@ -32,9 +32,9 @@ else() "GTEST_CREATE_SHARED_LIBRARY=1" ) - if (protobuf_INSTALL) - set(protobuf_INSTALL_TESTS ON) - endif() + endif() + if (protobuf_INSTALL) + set(protobuf_INSTALL_TESTS ON) endif() target_link_libraries(gmock ${CMAKE_THREAD_LIBS_INIT}) diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp index 78be63686b..c2435f8342 160000 --- a/third_party/abseil-cpp +++ b/third_party/abseil-cpp @@ -1 +1 @@ -Subproject commit 78be63686ba732b25052be15f8d6dee891c05749 +Subproject commit c2435f8342c2d0ed8101cb43adfd605fdc52dca2