Merge pull request #3213 from lilyinstarlight/fix/vcpkg-root

Build - update vcpkg versions and fix the VCPKG_ROOT variable that GHA now sets

Author: samaaron

.github/workflows/build.yml

@@ -32,12 +32,6 @@ jobs:
     # Get the code
     - uses: actions/checkout@v2
 
-    # hardcode cmake version
-    - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v1.12
-      with:
-        cmake-version: '3.22.3'
-
     # Install Ruby for the windows build
     - uses: ruby/setup-ruby@v1
       id: ruby-inst

app/linux-pre-vcpkg.sh

@@ -30,9 +30,11 @@ cd "${SCRIPT_DIR}"
 # Build vcpkg
 if [ ! -d "vcpkg" ]; then
     echo "Cloning vcpkg"
-    git clone --depth 1 --branch "${VCPKG_BRANCH:-2022.06.16.1}" https://github.com/microsoft/vcpkg.git vcpkg
+    git clone --depth 1 --branch "${VCPKG_BRANCH:-2022.08.15}" https://github.com/microsoft/vcpkg.git vcpkg
 fi
 
+export VCPKG_ROOT="$SCRIPT_DIR/vcpkg"
+
 if [ ! -f "vcpkg/vcpkg" ]; then
     echo "Building vcpkg"
     cd vcpkg

app/mac-pre-vcpkg.sh

@@ -30,9 +30,11 @@ cd "${SCRIPT_DIR}"
 # Build vcpkg
 if [ ! -d "vcpkg" ]; then
     echo "Cloning vcpkg"
-    git clone --depth 1 --branch 2022.06.16.1 https://github.com/microsoft/vcpkg.git vcpkg
+    git clone --depth 1 --branch 2022.08.15 https://github.com/microsoft/vcpkg.git vcpkg
 fi
 
+export VCPKG_ROOT="$SCRIPT_DIR/vcpkg"
+
 if [ ! -f "vcpkg/vcpkg" ]; then
     echo "Building vcpkg"
     cd vcpkg

app/win-pre-vcpkg.bat

@@ -8,6 +8,8 @@ if not exist "vcpkg\" (
     git clone --depth 1 --branch 2022.08.15 https://github.com/microsoft/vcpkg.git vcpkg
 )
 
+set VCPKG_ROOT=%~dp0/vcpkg
+
 if not exist "vcpkg\vcpkg.exe" (
     cd vcpkg
     echo Building vcpkg