From 72a5485e7f53dd5cd3b2777cf3d191ba38e1a291 Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Thu, 29 Oct 2020 18:52:37 +0100
Subject: [PATCH] Move vcpkg out of ScreenPlay source tree

This has some advatages. For one QtCreator starts way faster because
it queries _ALL_ files in the source dir. This can take to minute long
startup when using many packages. This makes some check python
scripts easier to write.
---
 Docs/DeveloperSetup.md                  | 6 +++---
 Tools/install_dependencies_linux_mac.sh | 6 +++---
 Tools/install_dependencies_windows.bat  | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Docs/DeveloperSetup.md b/Docs/DeveloperSetup.md
index a88bfbf1..c1b0f0a0 100644
--- a/Docs/DeveloperSetup.md
+++ b/Docs/DeveloperSetup.md
@@ -2,10 +2,10 @@
 1. Install latest [git + git-lfs](https://git-scm.com/)
 2. Clone ScreenPlay
 ``` bash
-git clone --recursive https://gitlab.com/kelteseth/ScreenPlay.git
+git clone --recursive https://gitlab.com/kelteseth/ScreenPlay.git ScreenPlay
 ```
 3. Download the latest [__Qt 5.15__](https://www.qt.io/download-qt-installer). Earlier versions are not supported!
-4. Start install-dependencies.bat to download dependencies into the Common/ folder
+4. Start install-dependencies.bat to download dependencies. ATTENTION: This will create a ScreenPlay-vcpkg folder in the same directory as your ScreenPlay source folder. 
 ``` bash
 //Windows
 .\Tools\install-dependencies.bat
@@ -27,7 +27,7 @@ chmod +x install-dependencies.sh
 7. Add CMake variables
     * Add CMAKE_TOOLCHAIN_FILE and VCPKG_TARGET_TRIPLET
        * Extras -> Tools -> Kits -> <Your Kit> -> CMake Configuration -> Append this:
-       * CMAKE_TOOLCHAIN_FILE:STRING=%{CurrentProject:Path}/Common/vcpkg/scripts/buildsystems/vcpkg.cmake
+       * CMAKE_TOOLCHAIN_FILE:STRING=%{CurrentProject:Path}/../ScreenPlay-vcpkg/vcpkg/scripts/buildsystems/vcpkg.cmake
        * VCPKG_TARGET_TRIPLET:STRING=x64-windows
        * or  Linux: x64-linux MacOSX: x64-osx
 
diff --git a/Tools/install_dependencies_linux_mac.sh b/Tools/install_dependencies_linux_mac.sh
index aace2227..5302f7eb 100644
--- a/Tools/install_dependencies_linux_mac.sh
+++ b/Tools/install_dependencies_linux_mac.sh
@@ -1,9 +1,9 @@
 git submodule update --init
 git submodule update --recursive
 cd ..
-cd Common
-git clone https://github.com/microsoft/vcpkg.git
-cd vcpkg
+cd ..
+git clone https://github.com/microsoft/vcpkg.git ScreenPlay-vcpkg
+cd ScreenPlay-vcpkg
 git pull
 # master 10.09.2020 - 18ab4b72a26284f0df28295ce7bf9b21c96f20f4
 git checkout 18ab4b72a26284f0df28295ce7bf9b21c96f20f4
diff --git a/Tools/install_dependencies_windows.bat b/Tools/install_dependencies_windows.bat
index 48618099..e1aa85e6 100644
--- a/Tools/install_dependencies_windows.bat
+++ b/Tools/install_dependencies_windows.bat
@@ -1,9 +1,9 @@
 git submodule update --init
 git submodule update --recursive
 cd ..
-cd Common
-git clone https://github.com/microsoft/vcpkg.git
-cd vcpkg
+cd ..
+git clone https://github.com/microsoft/vcpkg.git ScreenPlay-vcpkg
+cd ScreenPlay-vcpkg
 git pull
 rem  master 10.09.2020 - 18ab4b72a26284f0df28295ce7bf9b21c96f20f4
 git checkout  18ab4b72a26284f0df28295ce7bf9b21c96f20f4
@@ -13,7 +13,7 @@ rem Install vcpkg dependencies
 vcpkg.exe install openssl  sentry-native  --triplet x64-windows --recurse
 
 cd ..
-cd ..
+cd ScreenPlay
 
 rem Download 7-zip
 curl.exe -L https://www.7-zip.org/a/7z1900.msi --ssl-no-revoke --output 7z.msi