mirror of
https://github.com/microsoft/GSL.git
synced 2025-03-14 20:23:36 -04:00
Workaround: fix, remove "PATH=" from text
This commit is contained in:
parent
1b0c19afd1
commit
0f4fb04bac
@ -62,12 +62,12 @@ before_build:
|
|||||||
if ((Get-Content C:\Tools\vcpkg\toolsrc\VERSION.txt).Replace('.','').Trim('"') -lt 20181020) {
|
if ((Get-Content C:\Tools\vcpkg\toolsrc\VERSION.txt).Replace('.','').Trim('"') -lt 20181020) {
|
||||||
echo "Fallback to MSVC linker."
|
echo "Fallback to MSVC linker."
|
||||||
cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM% && PATH > path.txt'
|
cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM% && PATH > path.txt'
|
||||||
$env:PATH = Get-Content .\path.txt
|
$env:PATH = (Get-Content .\path.txt).Remove(0,5) # "PATH="
|
||||||
$LINKER = "link"
|
$LINKER = "link"
|
||||||
} else { echo "==> vcpkg has been updated, please remove the workaround from appvayor.yml." }
|
} else { echo "==> vcpkg has been updated, please remove the workaround from appvayor.yml." }
|
||||||
# /Workaround
|
# /Workaround
|
||||||
clang-cl --version
|
clang-cl --version
|
||||||
cmake .. -G "$env:generator" -T llvm -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_LINKER=$LINKER
|
cmake .. -G "$env:generator" -T llvm -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_LINKER=$LINKER
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
cmake .. -G "$env:generator" -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD"
|
cmake .. -G "$env:generator" -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user