From f0189643a455a638563d2decd189ec98a8730b0a Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Sun, 1 Dec 2019 13:34:15 +0100
Subject: [PATCH] Fix install dependencies

---
 .gitignore                                                 | 1 +
 .gitmodules                                                | 6 +++---
 Common/qt-google-analytics                                 | 1 +
 vcpkg-install-dependencies.bat => install-dependencies.bat | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)
 create mode 160000 Common/qt-google-analytics
 rename vcpkg-install-dependencies.bat => install-dependencies.bat (64%)

diff --git a/.gitignore b/.gitignore
index 63c65a9d..1c1199bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,4 @@ Common/vcpkg/**
 /build-*/**
 *_qmlcache.qrc
 *.DS_Store
+/Common/vcpkg/
diff --git a/.gitmodules b/.gitmodules
index 6c7d7dac..dc8963bc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "Common/qt-google-analytics"]
-	path = Common/qt-google-analytics
-	url = https://github.com/HSAnet/qt-google-analytics.git
 [submodule "Common/stomt-qt-sdk"]
 	path = Common/stomt-qt-sdk
 	url = https://github.com/Aimber/stomt-qt-sdk.git
+[submodule "Common/qt-google-analytics"]
+	path = Common/qt-google-analytics
+	url = https://github.com/HSAnet/qt-google-analytics.git
diff --git a/Common/qt-google-analytics b/Common/qt-google-analytics
new file mode 160000
index 00000000..c1eda356
--- /dev/null
+++ b/Common/qt-google-analytics
@@ -0,0 +1 @@
+Subproject commit c1eda35682b4b4c21a313eb8b4670527bf4a6f09
diff --git a/vcpkg-install-dependencies.bat b/install-dependencies.bat
similarity index 64%
rename from vcpkg-install-dependencies.bat
rename to install-dependencies.bat
index a77f96ff..4fb89dc5 100644
--- a/vcpkg-install-dependencies.bat
+++ b/install-dependencies.bat
@@ -1,6 +1,7 @@
-setlocal EnableExtensions
 
+git submodule update --recursive
 cd Common
+git clone https://github.com/microsoft/vcpkg.git
 cd vcpkg
 git pull
 git checkout origin/master