From a3a3afc0f0f328ea756d6ca937b7a2c24ae3cb72 Mon Sep 17 00:00:00 2001 From: Jammyjamjamman Date: Mon, 14 Jun 2021 02:13:49 +0100 Subject: [PATCH] Fix build script errors No longer errors when vcpkg path not specified. --- mk/windoze/build-mg-vs-cmake.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/windoze/build-mg-vs-cmake.ps1 b/mk/windoze/build-mg-vs-cmake.ps1 index aff20146..0e7af6e1 100644 --- a/mk/windoze/build-mg-vs-cmake.ps1 +++ b/mk/windoze/build-mg-vs-cmake.ps1 @@ -69,13 +69,13 @@ git pull Write-Title "Setup vcpkg" Test-Command "cmake" "Please download and install CMake: https://cmake.org/download/. (For 64 bit windows, select 'cmake-x.y.z-windows-x86_64.msi'.)" -${vcpkg-location} = $(Resolve-Path ${vcpkg-location}).ToString() -"path is ${vcpkg-location}" - if ( !${vcpkg-location} ) { ${vcpkg-location} = Join-Path $PSScriptRoot \vcpkg "Vcpkg location not set. Setting it to ${vcpkg-location}." } +else { + ${vcpkg-location} = $(Resolve-Path ${vcpkg-location}).ToString() +} if ( Test-Path ${vcpkg-location} ) { "Found vcpkg."