From fd492d920106afb877d830f9dfadb8947ced1011 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Fri, 14 Jul 2023 00:07:25 +0200
Subject: [PATCH] Clean up external projects, add distclean target

---
 CMakeLists.txt        | 14 ++++++++++++--
 CMakeLists.txt.fmtlib | 16 +++++++++-------
 CMakeLists.txt.gtest  |  4 ++++
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d63dfa2..e65ba3de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1049,8 +1049,8 @@ add_custom_target(
         "dwarfs_utils_test[1]_include.cmake"
         fbthrift folly zstd libarchive
         include src thrift universal bin lib man1 man5
-        fmtlib fmtlib-download fmtlib-install
-        googletest-build googletest-download googletest-src
+        fmtlib fmtlib-build fmtlib-install
+        googletest googletest-build
         vcpkg-manifest-install.log
         dwarfs.exe.manifest dwarfsbench.exe.manifest
         dwarfsck.exe.manifest dwarfsextract.exe.manifest
@@ -1063,6 +1063,16 @@ add_custom_target(
         Makefile
 )
 
+add_custom_target(
+  distclean
+  COMMAND
+    COMMAND ${CMAKE_MAKE_PROGRAM} realclean
+  COMMAND
+    ${CMAKE_COMMAND} -E rm -rf
+        fmtlib-download fmtlib-src
+        googletest-download googletest-src
+)
+
 file(GLOB_RECURSE ALL_SOURCES LIST_DIRECTORIES false
         ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp
diff --git a/CMakeLists.txt.fmtlib b/CMakeLists.txt.fmtlib
index be605894..4e11e5d6 100644
--- a/CMakeLists.txt.fmtlib
+++ b/CMakeLists.txt.fmtlib
@@ -6,11 +6,13 @@ include(ExternalProject)
 
 ExternalProject_Add(
   fmtlib
-  PREFIX ${CMAKE_CURRENT_BINARY_DIR}/fmtlib
-  GIT_REPOSITORY ${LIBFMT_GIT_REPO}
-  GIT_TAG 10.0.0
-  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=${CMAKE_BUILD_TYPE}
+  GIT_REPOSITORY    ${LIBFMT_GIT_REPO}
+  GIT_TAG           10.0.0
+  PREFIX            "${CMAKE_CURRENT_BINARY_DIR}/fmtlib"
+  SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/fmtlib-src"
+  BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/fmtlib-build"
+  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=${CMAKE_BUILD_TYPE}
 )
diff --git a/CMakeLists.txt.gtest b/CMakeLists.txt.gtest
index 18c73b9b..334f01e1 100644
--- a/CMakeLists.txt.gtest
+++ b/CMakeLists.txt.gtest
@@ -8,8 +8,12 @@ ExternalProject_Add(
   googletest
   GIT_REPOSITORY    ${GOOGLETEST_GIT_REPO}
   GIT_TAG           main
+  PREFIX            "${CMAKE_CURRENT_BINARY_DIR}/googletest"
   SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
   BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
+  CMAKE_ARGS        -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
+                    -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
+                    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
   CONFIGURE_COMMAND ""
   BUILD_COMMAND     ""
   INSTALL_COMMAND   ""