1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-18 08:22:33 +02:00

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.
This commit is contained in:
Elias Steurer 2020-10-29 18:52:37 +01:00
parent b5dae423cb
commit 72a5485e7f
3 changed files with 10 additions and 10 deletions

View File

@ -2,10 +2,10 @@
1. Install latest [git + git-lfs](https://git-scm.com/) 1. Install latest [git + git-lfs](https://git-scm.com/)
2. Clone ScreenPlay 2. Clone ScreenPlay
``` bash ``` 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! 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 ``` bash
//Windows //Windows
.\Tools\install-dependencies.bat .\Tools\install-dependencies.bat
@ -27,7 +27,7 @@ chmod +x install-dependencies.sh
7. Add CMake variables 7. Add CMake variables
* Add CMAKE_TOOLCHAIN_FILE and VCPKG_TARGET_TRIPLET * Add CMAKE_TOOLCHAIN_FILE and VCPKG_TARGET_TRIPLET
* Extras -> Tools -> Kits -> <Your Kit> -> CMake Configuration -> Append this: * 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 * VCPKG_TARGET_TRIPLET:STRING=x64-windows
* or Linux: x64-linux MacOSX: x64-osx * or Linux: x64-linux MacOSX: x64-osx

View File

@ -1,9 +1,9 @@
git submodule update --init git submodule update --init
git submodule update --recursive git submodule update --recursive
cd .. cd ..
cd Common cd ..
git clone https://github.com/microsoft/vcpkg.git git clone https://github.com/microsoft/vcpkg.git ScreenPlay-vcpkg
cd vcpkg cd ScreenPlay-vcpkg
git pull git pull
# master 10.09.2020 - 18ab4b72a26284f0df28295ce7bf9b21c96f20f4 # master 10.09.2020 - 18ab4b72a26284f0df28295ce7bf9b21c96f20f4
git checkout 18ab4b72a26284f0df28295ce7bf9b21c96f20f4 git checkout 18ab4b72a26284f0df28295ce7bf9b21c96f20f4

View File

@ -1,9 +1,9 @@
git submodule update --init git submodule update --init
git submodule update --recursive git submodule update --recursive
cd .. cd ..
cd Common cd ..
git clone https://github.com/microsoft/vcpkg.git git clone https://github.com/microsoft/vcpkg.git ScreenPlay-vcpkg
cd vcpkg cd ScreenPlay-vcpkg
git pull git pull
rem master 10.09.2020 - 18ab4b72a26284f0df28295ce7bf9b21c96f20f4 rem master 10.09.2020 - 18ab4b72a26284f0df28295ce7bf9b21c96f20f4
git checkout 18ab4b72a26284f0df28295ce7bf9b21c96f20f4 git checkout 18ab4b72a26284f0df28295ce7bf9b21c96f20f4
@ -13,7 +13,7 @@ rem Install vcpkg dependencies
vcpkg.exe install openssl sentry-native --triplet x64-windows --recurse vcpkg.exe install openssl sentry-native --triplet x64-windows --recurse
cd .. cd ..
cd .. cd ScreenPlay
rem Download 7-zip rem Download 7-zip
curl.exe -L https://www.7-zip.org/a/7z1900.msi --ssl-no-revoke --output 7z.msi curl.exe -L https://www.7-zip.org/a/7z1900.msi --ssl-no-revoke --output 7z.msi