From 27ac5b70034cc292a44e0a8bf3cdee850b58fe6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20M=C3=BCller?= <git@foonathan.net>
Date: Wed, 17 Feb 2021 13:44:04 +0100
Subject: [PATCH] Use FetchContent() instead of submodules

---
 .gitmodules             |  6 ------
 external/cxxopts        |  1 -
 external/external.cmake | 18 +++++++++---------
 external/type_safe      |  1 -
 4 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 external/cxxopts
 delete mode 160000 external/type_safe

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 3b26f01..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "external/type_safe"]
-	path = external/type_safe
-	url = https://github.com/foonathan/type_safe
-[submodule "external/cxxopts"]
-	path = external/cxxopts
-	url = https://github.com/jarro2783/cxxopts
diff --git a/external/cxxopts b/external/cxxopts
deleted file mode 160000
index 073dd3e..0000000
--- a/external/cxxopts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 073dd3e645fa0c853c3836f3788ca21c39af319d
diff --git a/external/external.cmake b/external/external.cmake
index ef3582b..e89407c 100644
--- a/external/external.cmake
+++ b/external/external.cmake
@@ -2,15 +2,16 @@
 # This file is subject to the license terms in the LICENSE file
 # found in the top-level directory of this distribution.
 
+include(FetchContent)
+
 #
 # install type safe
 #
 find_package(type_safe QUIET)
 if(NOT type_safe_FOUND)
-    message(STATUS "Installing type_safe via submodule")
-    execute_process(COMMAND git submodule update --init -- external/type_safe
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/type_safe EXCLUDE_FROM_ALL)
+    message(STATUS "Fetching type_safe")
+    FetchContent_Declare(type_safe GIT_REPOSITORY https://github.com/foonathan/type_safe GIT_TAG origin/main)
+    FetchContent_MakeAvailable(type_safe)
 endif()
 
 #
@@ -28,12 +29,11 @@ target_link_libraries(_cppast_tiny_process INTERFACE tiny-process-library::tiny-
 # install cxxopts, if needed
 #
 if(build_tool)
-    message(STATUS "Installing cxxopts via submodule")
-    execute_process(COMMAND git submodule update --init -- external/cxxopts
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+    set(CXXOPTS_BUILD_TESTS OFF CACHE BOOL "")
 
-    set(CXXOPTS_BUILD_TESTS OFF)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/cxxopts EXCLUDE_FROM_ALL)
+    message(STATUS "Fetching cxxopts")
+    FetchContent_Declare(cxxopts URL https://github.com/jarro2783/cxxopts/archive/v2.2.1.zip)
+    FetchContent_MakeAvailable(cxxopts)
 endif()
 
 #
diff --git a/external/type_safe b/external/type_safe
deleted file mode 160000
index ac4dfc7..0000000
--- a/external/type_safe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ac4dfc790f19f66097476bcae2fcd37d6fc05e23