diff --git a/.gitmodules b/.gitmodules index d41dd11d1a..6d0b2da127 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "tests/googletest"] path = tests/googletest url = https://github.com/google/googletest.git +[submodule "tools/vcpkg"] + path = tools/vcpkg + url = https://github.com/Microsoft/vcpkg.git diff --git a/appveyor.yml b/appveyor.yml index 04a3a551af..6dee3bd96b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,8 +29,12 @@ install: py.exe -m pip install openpyxl --user cup innosetup C:\ProgramData\chocolatey\tools\shimgen.exe --output=C:\ProgramData\chocolatey\bin\ISCC.exe --path="C:\Program Files (x86)\Inno Setup 6\ISCC.exe" + git submodule init + git submodule update chcp 65001 - vcpkg.exe integrate install + .\tools\vcpkg\bootstrap-vcpkg.bat + .\tools\vcpkg\vcpkg.exe integrate install + set VCPKG_INSTALLATION_ROOT=%APPVEYOR_BUILD_FOLDER%\tools\vcpkg # to run our custom scripts instead of automatic MSBuild build_script: diff --git a/tools/vcpkg b/tools/vcpkg new file mode 160000 index 0000000000..1e8122f2f8 --- /dev/null +++ b/tools/vcpkg @@ -0,0 +1 @@ +Subproject commit 1e8122f2f83d454e7b3aaf3a1a2f871d29570e96