Skip to content

Commit cf0ce2f

Browse files
author
Vincent Palancher
committed
build: Upgrades version of googletest to live at head.
The tagged versions of Googletest are considered obsolete. The recommended version is the one targeted by the `main` branch. This patch adds an include to `optional_io.hpp`, because a change in googletest caused one of our tests to try to output a `boost::optional`. Integration breaking change: the GOOGLETEST_VERSION CMake variable is no longer honored. Change-Id: Ie816821af53a79842ddad4f2e5c56e26a2e20782 Reviewed-on: http://gerrit2.aldebaran.lan/1761 Reviewed-by: philippe.martin <[email protected]> Reviewed-by: jmonnon <[email protected]> Tested-by: vincent.palancher <[email protected]>
1 parent d009f1d commit cf0ce2f

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

cmake/set_dependencies.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,13 @@ overridable_variable(PYBIND11_GIT_REPOSITORY https://github.com/pybind/pybind11)
5858
# `ExternalProject` module documentation of the `GIT_TAG` argument.
5959
overridable_variable(PYBIND11_GIT_TAG v${PYBIND11_VERSION})
6060

61-
# Version of googletest to use.
62-
overridable_variable(GOOGLETEST_VERSION 1.10.0)
63-
6461
# URL of the git repository from which to download googletest. For more details, see CMake
6562
# `ExternalProject` module documentation of the `GIT_REPOSITORY` argument.
6663
overridable_variable(GOOGLETEST_GIT_REPOSITORY https://github.com/google/googletest.git)
6764

6865
# Git branch name, tag or commit hash to checkout for googletest. For more details, see CMake
6966
# `ExternalProject` module documentation of the `GIT_TAG` argument.
70-
overridable_variable(GOOGLETEST_GIT_TAG release-${GOOGLETEST_VERSION})
67+
overridable_variable(GOOGLETEST_GIT_TAG main)
7168

7269
set(PYTHON_VERSION_STRING "" CACHE STRING "Version of Python to look for. This \
7370
variable can be specified by tools run directly from Python to enforce the \

tests/test_object.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <gtest/gtest.h>
1515
#include <gmock/gmock-matchers.h>
1616
#include <gmock/gmock.h>
17+
#include <boost/optional/optional_io.hpp>
1718
#include "common.hpp"
1819

1920
namespace py = pybind11;

0 commit comments

Comments
 (0)