Fix build script errors
No longer errors when vcpkg path not specified.
This commit is contained in:
parent
ce0345854c
commit
a3a3afc0f0
|
@ -69,13 +69,13 @@ git pull
|
||||||
Write-Title "Setup vcpkg"
|
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'.)"
|
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} ) {
|
if ( !${vcpkg-location} ) {
|
||||||
${vcpkg-location} = Join-Path $PSScriptRoot \vcpkg
|
${vcpkg-location} = Join-Path $PSScriptRoot \vcpkg
|
||||||
"Vcpkg location not set. Setting it to ${vcpkg-location}."
|
"Vcpkg location not set. Setting it to ${vcpkg-location}."
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
${vcpkg-location} = $(Resolve-Path ${vcpkg-location}).ToString()
|
||||||
|
}
|
||||||
|
|
||||||
if ( Test-Path ${vcpkg-location} ) {
|
if ( Test-Path ${vcpkg-location} ) {
|
||||||
"Found vcpkg."
|
"Found vcpkg."
|
||||||
|
|
Loading…
Reference in New Issue