From ef1b800a7185cb1d276180f8462aca06e5d6aae9 Mon Sep 17 00:00:00 2001
From: tresf <tres.finocchiaro@gmail.com>
Date: Sat, 5 Oct 2019 00:05:40 -0400
Subject: [PATCH 1/3] Try delete

---
 cmake/modules/CheckSubmodules.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmake/modules/CheckSubmodules.cmake b/cmake/modules/CheckSubmodules.cmake
index d2475826bad..bdb1c37fa97 100644
--- a/cmake/modules/CheckSubmodules.cmake
+++ b/cmake/modules/CheckSubmodules.cmake
@@ -117,6 +117,8 @@ MACRO(GIT_SUBMODULE SUBMODULE_PATH FORCE_DEINIT FORCE_REMOTE FULL_CLONE)
 		# Recurse
 		GIT_SUBMODULE(${SUBMODULE_PATH} false false ${FULL_CLONE_FLAG})
 	ELSEIF(${FORCE_DEINIT})
+		MESSAGE("--   Deleting ${CMAKE_SOURCE_DIR}/.git/${SUBMODULE_PATH}")
+		FILE(REMOVE_RECURSE "${CMAKE_SOURCE_DIR}/.git/modules/${SUBMODULE_PATH}")
 		MESSAGE("--   Resetting ${SUBMODULE_PATH}")
 		EXECUTE_PROCESS(
 			COMMAND "${GIT_EXECUTABLE}" submodule deinit -f "${CMAKE_SOURCE_DIR}/${SUBMODULE_PATH}"
@@ -124,7 +126,7 @@ MACRO(GIT_SUBMODULE SUBMODULE_PATH FORCE_DEINIT FORCE_REMOTE FULL_CLONE)
 			OUTPUT_QUIET
 		)
 		# Recurse
-		GIT_SUBMODULE(${SUBMODULE_PATH} false false ${FULL_CLONE_FLAG})
+		GIT_SUBMODULE(${SUBMODULE_PATH} false false true)
 	ELSE()
 		# Try to use the depth switch
 		IF(NO_SHALLOW_CLONE OR GIT_VERSION_STRING VERSION_LESS "1.8.4")

From 47b2abce54bdd8895d4c31034ba249d82fee0161 Mon Sep 17 00:00:00 2001
From: tresf <tres.finocchiaro@gmail.com>
Date: Sat, 5 Oct 2019 00:45:13 -0400
Subject: [PATCH 2/3] Use math, not concat :D

---
 cmake/modules/CheckSubmodules.cmake | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cmake/modules/CheckSubmodules.cmake b/cmake/modules/CheckSubmodules.cmake
index bdb1c37fa97..d8f0200b4fb 100644
--- a/cmake/modules/CheckSubmodules.cmake
+++ b/cmake/modules/CheckSubmodules.cmake
@@ -181,11 +181,9 @@ FOREACH(_submodule ${SUBMODULE_LIST})
 		GIT_SUBMODULE("${_submodule}" false false false)
 
 		SET(COUNTED 0)
-		SET(COUNTING "")
 		# Handle edge-cases where submodule didn't clone properly or re-uses a non-empty directory
 		WHILE(NOT GIT_RESULT EQUAL 0 AND COUNTED LESS MAX_ATTEMPTS)
-			LIST(APPEND COUNTING "x")
-			LIST(LENGTH COUNTING COUNTED)
+			MATH(EXPR COUNTED "${COUNTED}+1")
 			SET(MISSING_COMMIT false)
 			FOREACH(_phrase ${MISSING_COMMIT_PHRASES})
 				IF("${GIT_MESSAGE}" MATCHES "${_phrase}")

From 46e80c0f4a5885c1db0e6f211a287b75c396be73 Mon Sep 17 00:00:00 2001
From: tresf <tres.finocchiaro@gmail.com>
Date: Sun, 6 Oct 2019 00:14:22 -0400
Subject: [PATCH 3/3] Is it worth it? Let me work it I put my thing down, flip
 it and reverse it

---
 cmake/modules/CheckSubmodules.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/CheckSubmodules.cmake b/cmake/modules/CheckSubmodules.cmake
index d8f0200b4fb..32a2f995181 100644
--- a/cmake/modules/CheckSubmodules.cmake
+++ b/cmake/modules/CheckSubmodules.cmake
@@ -117,14 +117,14 @@ MACRO(GIT_SUBMODULE SUBMODULE_PATH FORCE_DEINIT FORCE_REMOTE FULL_CLONE)
 		# Recurse
 		GIT_SUBMODULE(${SUBMODULE_PATH} false false ${FULL_CLONE_FLAG})
 	ELSEIF(${FORCE_DEINIT})
-		MESSAGE("--   Deleting ${CMAKE_SOURCE_DIR}/.git/${SUBMODULE_PATH}")
-		FILE(REMOVE_RECURSE "${CMAKE_SOURCE_DIR}/.git/modules/${SUBMODULE_PATH}")
 		MESSAGE("--   Resetting ${SUBMODULE_PATH}")
 		EXECUTE_PROCESS(
 			COMMAND "${GIT_EXECUTABLE}" submodule deinit -f "${CMAKE_SOURCE_DIR}/${SUBMODULE_PATH}"
 			WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
 			OUTPUT_QUIET
 		)
+		MESSAGE("--   Deleting ${CMAKE_SOURCE_DIR}/.git/${SUBMODULE_PATH}")
+		FILE(REMOVE_RECURSE "${CMAKE_SOURCE_DIR}/.git/modules/${SUBMODULE_PATH}")
 		# Recurse
 		GIT_SUBMODULE(${SUBMODULE_PATH} false false true)
 	ELSE()