Replace external/googletest with external dependency

.github/workflows/main.yml

@@ -66,25 +66,66 @@ jobs:
         if: ${{ matrix.os == 'ubuntu-latest' && matrix.arch == 64 }}
         run: |
           sudo apt-get update
-          sudo apt install -y gcc-multilib g++-multilib cmake build-essential \
-                automake clang-6.0 g++-8 libc++-dev libogg-dev libvorbis-dev \
-                libopenal-dev libboost-all-dev libsdl2-dev libsdl2-image-dev \
-                libfreetype6-dev libharfbuzz-dev libfribidi-dev libglib2.0-dev \
-                gtk-doc-tools rpm sshpass libraqm-dev libglew-dev libcurl4-openssl-dev
+          sudo apt-get install -y \
+            cmake \
+            build-essential \
+            automake \
+            gtk-doc-tools \
+            rpm \
+            sshpass \
+            clang-6.0 \
+            g++-8 \
+            gcc-multilib \
+            g++-multilib \
+            libgtest-dev \
+            libc++-dev \
+            libogg-dev \
+            libvorbis-dev \
+            libopenal-dev \
+            libboost-all-dev \
+            libsdl2-dev \
+            libsdl2-image-dev \
+            libfreetype6-dev \
+            libharfbuzz-dev \
+            libfribidi-dev \
+            libglib2.0-dev \
+            libraqm-dev \
+            libglew-dev \
+            libcurl4-openssl-dev
       - name: Install 32-bit linux dependencies
         if: ${{ matrix.os == 'ubuntu-latest' && matrix.arch == 32 }}
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt install -y cmake build-essential automake gtk-doc-tools rpm sshpass
-          sudo apt install -yf gcc-multilib g++-multilib libogg-dev:i386 libvorbis-dev:i386 libopenal-dev:i386 libboost-date-time-dev:i386 libboost-filesystem-dev:i386 libboost-locale-dev:i386 libsdl2-dev:i386 libsdl2-image-dev:i386 libfreetype6-dev:i386 libcurl4-openssl-dev:i386 libharfbuzz-dev:i386 libfribidi-dev:i386
+          sudo apt-get install -y \
+            cmake \
+            build-essential \
+            automake \
+            gtk-doc-tools \
+            rpm \
+            sshpass \
+            gcc-multilib \
+            g++-multilib \
+            libgtest-dev:i386 \
+            libogg-dev:i386 \
+            libvorbis-dev:i386 \
+            libopenal-dev:i386 \
+            libboost-date-time-dev:i386 \
+            libboost-filesystem-dev:i386 \
+            libboost-locale-dev:i386 \
+            libsdl2-dev:i386 \
+            libsdl2-image-dev:i386 \
+            libfreetype6-dev:i386 \
+            libcurl4-openssl-dev:i386 \
+            libharfbuzz-dev:i386 \
+            libfribidi-dev:i386
           # Nethier GLEW nor glbinding exist in 32-bit for Ubuntu 20.04, so snatch the debs from 16.04 instead
           wget archive.ubuntu.com/ubuntu/pool/main/g/glew/libglew1.13_1.13.0-2_i386.deb && sudo dpkg -i libglew1.13_1.13.0-2_i386.deb
           wget archive.ubuntu.com/ubuntu/pool/main/g/glew/libglew-dev_1.13.0-2_i386.deb && sudo dpkg -i libglew-dev_1.13.0-2_i386.deb
       - name: Install macos dependencies
         if: ${{ matrix.os == 'macos-latest' }}
         run: |
-          brew install cmake bash libogg libvorbis glew openal-soft sdl2 sdl2_image sdl2_ttf \
+          brew install cmake googletest bash libogg libvorbis glew openal-soft sdl2 sdl2_image sdl2_ttf \
                 freetype harfbuzz fribidi glib gtk-doc glbinding libraqm
           # Something funky happens with freetype if mono is left
           sudo mv /Library/Frameworks/Mono.framework /Library/Frameworks/Mono.framework-disabled
@@ -218,6 +259,7 @@ jobs:
           ARCH: ${{ matrix.arch }}
         run: |
           vcpkg integrate install
+          vcpkg install gtest:$Env:ARCH-windows
           vcpkg install boost-date-time:$Env:ARCH-windows
           vcpkg install boost-filesystem:$Env:ARCH-windows
           vcpkg install boost-format:$Env:ARCH-windows

.github/workflows/other.yml

@@ -57,6 +57,7 @@ jobs:
             pkg install -y pkgconf
             pkg install -y git
             pkg install -y cmake
+            pkg install -y googletest
             pkg install -y sdl2
             pkg install -y sdl2_image
             pkg install -y openal-soft

CMakeLists.txt

@@ -921,21 +921,14 @@ endif(HAVE_LIBCURL)
 
 if(BUILD_TESTS)
   find_package(Threads REQUIRED)
-
-  # build gtest
-  # ${CMAKE_CURRENT_SOURCE_DIR} in include_directories is needed to generate -isystem instead of -I flags
-  add_library(gtest_main STATIC ${CMAKE_CURRENT_SOURCE_DIR}/external/googletest/googletest/src/gtest_main.cc)
-  target_include_directories(gtest_main SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/external/googletest/googletest/include/)
-  add_library(gtest STATIC ${CMAKE_CURRENT_SOURCE_DIR}/external/googletest/googletest/src/gtest-all.cc)
-  target_include_directories(gtest SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/external/googletest/googletest/)
-  target_include_directories(gtest SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/external/googletest/googletest/include/)
+  find_package(GTest REQUIRED)
 
   # build SuperTux tests
   file(GLOB TEST_SUPERTUX_SOURCES tests/*.cpp)
   add_executable(test_supertux2 ${TEST_SUPERTUX_SOURCES})
   target_compile_options(test_supertux2 PRIVATE ${WARNINGS_CXX_FLAGS})
   target_link_libraries(test_supertux2
-    gtest gtest_main
+    GTest::GTest GTest::Main
     supertux2_lib
     ${CMAKE_THREAD_LIBS_INIT})