Fetch zsync2 using FetchContent

Author: TheAssassin

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "lib/zsync2"]
-path = lib/zsync2
-url = https://github.com/AppImage/zsync2
 [submodule "lib/fltk"]
 path = lib/fltk
 url = https://github.com/TheAssassin/fltk-1.3.4

CMakeLists.txt

@@ -36,6 +36,8 @@ option(ENABLE_SANITIZERS "Enable builds using sanitizers" off)
 # install into proper dirs on Linux
 include(GNUInstallDirs)
 
+include(FetchContent)
+
 option(USE_SYSTEM_ZSYNC2 OFF "Use existing libzsync2 installed on system (or inside CMAKE_PREFIX_PATH)")
 if(USE_SYSTEM_ZSYNC2)
  set(USE_SYSTEM_CPR ON)
@@ -46,6 +48,16 @@ if(USE_SYSTEM_ZSYNC2)
 
  # note: find_package calls must be made in the same or a parent scope
  find_package(zsync2 REQUIRED)
+else()
+ function(import_zsync2)
+ FetchContent_Declare(zsync2
+ GIT_REPOSITORY https://github.com/AppImageCommunity/zsync2
+ GIT_TAG 2.0.0-alpha-1-20230304
+ )
+ FetchContent_MakeAvailable(zsync2)
+ endfunction()
+
+ import_zsync2()
 endif()
 
 option(USE_SYSTEM_LIBAPPIMAGE OFF "Use existing libappimage installed on system (or inside CMAKE_PREFIX_PATH)")
@@ -54,8 +66,6 @@ if(USE_SYSTEM_LIBAPPIMAGE)
  find_package(libappimage REQUIRED)
 else()
  function(import_libappimage)
- include(FetchContent)
-
  FetchContent_Declare(libappimage
  GIT_REPOSITORY https://github.com/AppImageCommunity/libappimage
  GIT_TAG 3467b20
@@ -77,9 +87,6 @@ if(NOT BUILD_LIBAPPIMAGEUPDATE_ONLY)
  endif()
 endif()
 
-# include external libraries
-add_subdirectory(lib)
-
 # core source directory, contains its own CMakeLists.txt
 add_subdirectory(src)
 

ci/Dockerfile.i386

@@ -16,6 +16,9 @@ RUN apt-get update && \
  libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev && \
  wget -qO- https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.24.0-ubuntu_"$DIST"-"$ARCH".tar.gz | tar xzv -C/usr --strip-components=1
 
+COPY ./install-gtest.sh /
+RUN bash /install-gtest.sh
+
 COPY pkgconfig/*.pc /usr/lib/i386-linux-gnu/pkgconfig/
 RUN sed -i 's|x86_64|i386|g' /usr/lib/i386-linux-gnu/pkgconfig/*.pc
 

ci/Dockerfile.x86_64

@@ -16,6 +16,9 @@ RUN apt-get update && \
  libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev && \
  wget -qO- https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.24.0-ubuntu_"$DIST"-"$ARCH".tar.gz | tar xzv -C/usr --strip-components=1
 
+COPY ./install-gtest.sh /
+RUN bash /install-gtest.sh
+
 COPY pkgconfig/*.pc /usr/lib/x86_64-linux-gnu/pkgconfig/
 
 COPY entrypoint.sh /

ci/install-gtest.sh

@@ -0,0 +1,21 @@
+#! /bin/bash
+
+set -euxo pipefail
+
+tempdir="$(mktemp -d)"
+
+_cleanup() {
+ [[ -d "$tempdir" ]] && rm -r "$tempdir"
+}
+trap _cleanup EXIT
+
+cd "$tempdir"
+
+git clone https://github.com/google/googletest -b v1.13.0 .
+
+mkdir build
+cd build
+
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+make -j6
+make install