From ec07d033054b85de3a295e85b918fc3b29c9c9ab Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Sun, 25 Jun 2023 18:27:38 +0200
Subject: [PATCH] CMakeLists.txt.* tweaks

---
 CMakeLists.txt.fmtlib     | 5 +++--
 CMakeLists.txt.gtest      | 4 +++-
 CMakeLists.txt.libarchive | 7 ++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt.fmtlib b/CMakeLists.txt.fmtlib
index 4c0c84ce..be605894 100644
--- a/CMakeLists.txt.fmtlib
+++ b/CMakeLists.txt.fmtlib
@@ -9,7 +9,8 @@ ExternalProject_Add(
   PREFIX ${CMAKE_CURRENT_BINARY_DIR}/fmtlib
   GIT_REPOSITORY ${LIBFMT_GIT_REPO}
   GIT_TAG 10.0.0
-  CMAKE_ARGS -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
+  CMAKE_ARGS -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
+             -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
              -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/fmtlib-install
-             -DCMAKE_BUILD_TYPE=Release
+             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 )
diff --git a/CMakeLists.txt.gtest b/CMakeLists.txt.gtest
index 69a6600d..18c73b9b 100644
--- a/CMakeLists.txt.gtest
+++ b/CMakeLists.txt.gtest
@@ -3,7 +3,9 @@ cmake_minimum_required(VERSION 2.8.11)
 project(googletest-download NONE)
 
 include(ExternalProject)
-ExternalProject_Add(googletest
+
+ExternalProject_Add(
+  googletest
   GIT_REPOSITORY    ${GOOGLETEST_GIT_REPO}
   GIT_TAG           main
   SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
diff --git a/CMakeLists.txt.libarchive b/CMakeLists.txt.libarchive
index d7f6aab8..6848941d 100644
--- a/CMakeLists.txt.libarchive
+++ b/CMakeLists.txt.libarchive
@@ -8,10 +8,11 @@ ExternalProject_Add(
   libarchive
   PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libarchive
   GIT_REPOSITORY ${LIBARCHIVE_GIT_REPO}
-  GIT_TAG "v3.6.1"
-  CMAKE_ARGS -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
+  GIT_TAG "v3.6.2"
+  CMAKE_ARGS -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
+             -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
              -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/libarchive-install
-             -DCMAKE_BUILD_TYPE=Release
+             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
              -DENABLE_ICONV:BOOL=OFF
              -DENABLE_LIBXML2:BOOL=OFF
 )