para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check vcpkg version; try without building vcpkg; use latest clang-cl from path (#741)

Browse Source
This commit is contained in:
Roelf-Jilling 2018-11-14 12:03:47 +01:00
parent 92f69b6499
commit c4845bb90a
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
appveyor.yml
View File

@ -19,19 +19,20 @@ environment:
#- GSL_CXX_STANDARD: 17 #- GSL_CXX_STANDARD: 17
# USE_TOOLSET: MSVC # USE_TOOLSET: MSVC
- GSL_CXX_STANDARD: 14 - GSL_CXX_STANDARD: 14
USE_TOOLSET: clang-cl USE_TOOLSET: LLVM
- GSL_CXX_STANDARD: 17 - GSL_CXX_STANDARD: 17
USE_TOOLSET: clang-cl USE_TOOLSET: LLVM
matrix: matrix:
exclude: exclude:
- image: Visual Studio 2015 - image: Visual Studio 2015
GSL_CXX_STANDARD: 17 GSL_CXX_STANDARD: 17
- image: Visual Studio 2015 - image: Visual Studio 2015
USE_TOOLSET: clang-cl USE_TOOLSET: LLVM
cache: cache:
- C:\cmake-3.8.0-win32-x86 - C:\cmake-3.8.0-win32-x86
- C:\Tools\vcpkg
install: install:
- ps: | - ps: |
@ -40,16 +41,23 @@ install:
7z x -y cmake-3.8.0-win32-x86.zip -oC:\ 7z x -y cmake-3.8.0-win32-x86.zip -oC:\
} }
$env:PATH="C:\cmake-3.8.0-win32-x86\bin;$env:PATH" $env:PATH="C:\cmake-3.8.0-win32-x86\bin;$env:PATH"
- cd C:\Tools\vcpkg #
- git pull # Until vcpkg has been updated.
- .\bootstrap-vcpkg.bat if ("$env:USE_TOOLSET=" -match "LLVM" -and
- cd %APPVEYOR_BUILD_FOLDER% (Get-Content C:\Tools\vcpkg\toolsrc\VERSION.txt).Replace('.','').Trim('"') -lt 20181020
) {
cd C:\Tools\vcpkg
git pull
cd %APPVEYOR_BUILD_FOLDER%
}
else { echo "Vcpkg fix is no longer needed." }
# Note: vcpkg can also be removed from "cache".
}
before_build: before_build:
- ps: | - ps: |
mkdir build mkdir build
cd build cd build
if ("$env:APPVEYOR_JOB_NAME" -match "Image: Visual Studio 2015") { if ("$env:APPVEYOR_JOB_NAME" -match "Image: Visual Studio 2015") {
$env:generator="Visual Studio 14 2015" $env:generator="Visual Studio 14 2015"
} else { } else {
@ -59,8 +67,9 @@ before_build:
$env:generator="$env:generator Win64" $env:generator="$env:generator Win64"
} }
echo generator="$env:generator" echo generator="$env:generator"
if ("$env:USE_TOOLSET=" -match "clang-cl") { if ("$env:USE_TOOLSET=" -match "LLVM") {
cmake .. -G "$env:generator" -T llvm -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" -DCMAKE_CXX_COMPILER="C:\\Program Files\\LLVM\\bin\\clang-cl.exe" clang-cl --version
cmake .. -G "$env:generator" -T llvm -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" -DCMAKE_CXX_COMPILER="clang-cl"
} }
else { else {
cmake .. -G "$env:generator" -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" cmake .. -G "$env:generator" -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD"