diff --git a/segysdk/generate_vs_solution.ps1 b/segysdk/generate_vs_solution.ps1 index 144bc07e2404bf6eec38dda610bb9abb627f2709..8c4293bdd2fb0208e57cd0df3ed50f97b9b3c491 100644 --- a/segysdk/generate_vs_solution.ps1 +++ b/segysdk/generate_vs_solution.ps1 @@ -8,17 +8,18 @@ param ( [string]$Project = 'SegySDKProject' [string]$ProjectArea = $PSScriptRoot +[string]$vcpkghome = $env:VCPKG_HOME [string]$outFolder = 'out/' [string]$buildArea = $ProjectArea + '/' + $outFolder -$env:VCPKG_HOME='C:\vcpkg' +if ($null -eq $env:VCPKG_HOME) { $env:VCPKG_HOME='C:\vcpkg' } cls; -"VCPKG_HOME = $env:VCPKG_HOME" - - +if (-not ($vcpkghome)){ + $vcpkghome = "C:\vcpkg" +} if ($cleanup) { "Cleanup of build area $buildArea requested ... " @@ -47,9 +48,10 @@ if ( -not (Test-Path -LiteralPath $buildArea -PathType Container )) mkdir $buildArea; cd $buildArea; - # cmake ..\src -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"; - cmake ..\src -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"; - } Else { + # cmake ..\src -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="$vcpkghome/scripts/buildsystems/vcpkg.cmake"; + cmake ..\ -DCMAKE_TOOLCHAIN_FILE="$vcpkghome/scripts/buildsystems/vcpkg.cmake"; + } +else { " - Project: $Project"; " - Project area: $ProjectArea";