From 9a048c643a278c432f227fa9af078fbd055250e0 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 10 Dec 2021 08:12:28 +1300
Subject: [PATCH 1/2] Don't have the Web app as a submodule

---
 .gitmodules    | 3 ---
 CMakeLists.txt | 8 ++++++++
 vircadia-web   | 1 -
 3 files changed, 8 insertions(+), 4 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 vircadia-web

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index c8cdef6d56..0000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "vircadia-web"]
-	path = vircadia-web
-	url = ../vircadia-web.git
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aaafe2b3fc..c8d59e10f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -349,12 +349,20 @@ GroupSources("scripts")
 GroupSources("unpublishedScripts")
 unset(JS_SRC)
 
+# Include Vircadia Web app files if cloned into a subdirectory.
 file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*)
 list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" )
 add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC})
 GroupSources("vircadia-web")
 unset(WEB_APP_SRC)
 
+# Include Vircadia Web SDK files if cloned into a subdirectory.
+file(GLOB_RECURSE WEB_SDK_SRC vircadia-web-sdk/*.*)
+list(FILTER WEB_SDK_SRC EXCLUDE REGEX "vircadia-web-sdk/(dist|node_modules|public)/*" )
+add_custom_target(vircadia-web-sdk SOURCES ${WEB_SDK_SRC})
+GroupSources("vircadia-web-sdk")
+unset(WEB_SDK_SRC)
+
 set_packaging_parameters()
 
 # Locate the required Qt build on the filesystem
diff --git a/vircadia-web b/vircadia-web
deleted file mode 160000
index 0afaa769d4..0000000000
--- a/vircadia-web
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0afaa769d46683d461c9288aa31468f64cba0233

From 5b82d7792fbcb5ab3fb4090a31339bcc4e4bc862 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 10 Dec 2021 08:26:39 +1300
Subject: [PATCH 2/2] Include Web app and SDK files in solution only if present

---
 CMakeLists.txt | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8d59e10f9..587c2f870e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -350,18 +350,22 @@ GroupSources("unpublishedScripts")
 unset(JS_SRC)
 
 # Include Vircadia Web app files if cloned into a subdirectory.
-file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*)
-list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" )
-add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC})
-GroupSources("vircadia-web")
-unset(WEB_APP_SRC)
+if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web")
+    file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*)
+    list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" )
+    add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC})
+    GroupSources("vircadia-web")
+    unset(WEB_APP_SRC)
+endif()
 
 # Include Vircadia Web SDK files if cloned into a subdirectory.
-file(GLOB_RECURSE WEB_SDK_SRC vircadia-web-sdk/*.*)
-list(FILTER WEB_SDK_SRC EXCLUDE REGEX "vircadia-web-sdk/(dist|node_modules|public)/*" )
-add_custom_target(vircadia-web-sdk SOURCES ${WEB_SDK_SRC})
-GroupSources("vircadia-web-sdk")
-unset(WEB_SDK_SRC)
+if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web-sdk")
+    file(GLOB_RECURSE WEB_SDK_SRC vircadia-web-sdk/*.*)
+    list(FILTER WEB_SDK_SRC EXCLUDE REGEX "vircadia-web-sdk/(dist|node_modules|public)/*" )
+    add_custom_target(vircadia-web-sdk SOURCES ${WEB_SDK_SRC})
+    GroupSources("vircadia-web-sdk")
+    unset(WEB_SDK_SRC)
+endif()
 
 set_packaging_parameters()