From 77128620363c93608979e1356bf2a3aea76ce0c7 Mon Sep 17 00:00:00 2001
From: ebbit1q <ebbit1q@gmail.com>
Date: Sun, 31 Oct 2021 03:15:50 +0100
Subject: [PATCH] add ubuntu 21.10 to ci (#4446)

* add ubuntu 21.10 to ci

remove ubuntu 20.10

* forgot to update dockerfile

* add googletest from repos

* update downloaded gtest

ideally this should just grab the master version

* fix hash

* fix cmake issue
---
 .ci/{UbuntuGroovy => UbuntuImpish}/Dockerfile | 3 +--
 .github/workflows/ci-builds.yml               | 4 ++--
 cmake/gtest-CMakeLists.txt.in                 | 6 +++---
 tests/CMakeLists.txt                          | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename .ci/{UbuntuGroovy => UbuntuImpish}/Dockerfile (93%)

diff --git a/.ci/UbuntuGroovy/Dockerfile b/.ci/UbuntuImpish/Dockerfile
similarity index 93%
rename from .ci/UbuntuGroovy/Dockerfile
rename to .ci/UbuntuImpish/Dockerfile
index 92528ba3..890dbec8 100644
--- a/.ci/UbuntuGroovy/Dockerfile
+++ b/.ci/UbuntuImpish/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:groovy
+FROM ubuntu:impish
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -17,7 +17,6 @@ RUN apt-get update && \
         libqt5svg5-dev \
         libqt5websockets5-dev \
         protobuf-compiler \
-        qt5-default \
         qtmultimedia5-dev \
         qttools5-dev \
         qttools5-dev-tools \
diff --git a/.github/workflows/ci-builds.yml b/.github/workflows/ci-builds.yml
index 08e4fefb..700ab8b0 100644
--- a/.github/workflows/ci-builds.yml
+++ b/.github/workflows/ci-builds.yml
@@ -82,10 +82,10 @@ jobs:
       matrix:
         # these names correspond to the files in .ci/$distro
         include:
-          - distro: UbuntuHirsute
+          - distro: UbuntuImpish
             package: DEB
 
-          - distro: UbuntuGroovy
+          - distro: UbuntuHirsute
             package: DEB
             test: skip
 
diff --git a/cmake/gtest-CMakeLists.txt.in b/cmake/gtest-CMakeLists.txt.in
index 265a02b1..2d71a55e 100644
--- a/cmake/gtest-CMakeLists.txt.in
+++ b/cmake/gtest-CMakeLists.txt.in
@@ -4,12 +4,12 @@ project(gtest-download LANGUAGES NONE)
 
 include(ExternalProject)
 ExternalProject_Add(googletest
-  URL https://github.com/google/googletest/archive/release-1.7.0.zip
-  URL_HASH SHA1=f89bc9f55477df2fde082481e2d709bfafdb057b
+  URL https://github.com/google/googletest/archive/release-1.11.0.zip
+  URL_HASH SHA1=9ffb7b5923f4a8fcdabf2f42c6540cce299f44c0
   SOURCE_DIR "${CMAKE_BINARY_DIR}/gtest-src"
   BINARY_DIR "${CMAKE_BINARY_DIR}/gtest-build"
   CONFIGURE_COMMAND ""
   BUILD_COMMAND     ""
   INSTALL_COMMAND   ""
   TEST_COMMAND      ""
-)
\ No newline at end of file
+)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index aed3d14d..fa3e2f6c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -29,7 +29,7 @@ if(NOT GTEST_FOUND)
     # Add the gtest include directory, since gtest
     # doesn't add that dependency to its gtest target
     target_include_directories(gtest INTERFACE
-            "${CMAKE_BINARY_DIR}/gtest-src/include" )
+            "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/gtest-src/include>" )
 
     SET(GTEST_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/gtest-src/include")
     SET(GTEST_BOTH_LIBRARIES gtest)