Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update googletest to 1.11 to fix build with gcc 11 #1916

Merged
merged 1 commit into from
Jan 13, 2022
Merged

Update googletest to 1.11 to fix build with gcc 11 #1916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)

# Add googletest directly to our build. This defines
# the gtest and gtest_main targets.
add_subdirectory(${CMAKE_SOURCE_DIR}/build/local/src/gtest/googletest-release-1.10.0
add_subdirectory(${CMAKE_SOURCE_DIR}/build/local/src/gtest/googletest-release-1.11.0
${CMAKE_CURRENT_BINARY_DIR}/googletest-build
EXCLUDE_FROM_ALL)

Expand Down
11 changes: 0 additions & 11 deletions tools/gtest.patch
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tools/gtest_mock.patch
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tools/gtest_test.patch
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions tools/install-dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export LD_LIBRARY_PATH="$PREFIX/lib"
export LD_RUN_PATH="$PREFIX/lib"

# Download Google Test
export GTEST_VERSION=1.10.0
export GTEST_VERSION=1.11.0
GTEST_DIR="$ROOT/build/local/src/gtest"
mkdir -p "$GTEST_DIR"
cd "$GTEST_DIR"
Expand All @@ -26,12 +26,6 @@ tar xzf release-$GTEST_VERSION.tar.gz

# Build gtest
cd googletest-release-$GTEST_VERSION
echo "patching cmake minimum version"
cp $ROOT/tools/*.patch .
patch CMakeLists.txt gtest.patch
patch googletest/CMakeLists.txt gtest_test.patch
patch googlemock/CMakeLists.txt gtest_mock.patch

cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -H.
make -j4
make install
Expand Down