mirror of
https://github.com/microsoft/GSL.git
synced 2024-11-03 17:56:43 -05:00
Corrections Appveyor;
Temporarily disable msvc compilation for faster testing (#741)
This commit is contained in:
parent
7347fc5afa
commit
1a15d747de
18
appveyor.yml
18
appveyor.yml
@ -14,21 +14,21 @@ image:
|
|||||||
|
|
||||||
environment:
|
environment:
|
||||||
matrix:
|
matrix:
|
||||||
|
#- GSL_CXX_STANDARD: 14
|
||||||
|
# USE_TOOLSET: MSVC
|
||||||
|
#- GSL_CXX_STANDARD: 17
|
||||||
|
# USE_TOOLSET: MSVC
|
||||||
- GSL_CXX_STANDARD: 14
|
- GSL_CXX_STANDARD: 14
|
||||||
USE_COMPILER: MSVC
|
USE_TOOLSET: clang-cl
|
||||||
- GSL_CXX_STANDARD: 14
|
|
||||||
USE_COMPILER: MSVC
|
|
||||||
- GSL_CXX_STANDARD: 17
|
- GSL_CXX_STANDARD: 17
|
||||||
USE_COMPILER: clang-cl
|
USE_TOOLSET: clang-cl
|
||||||
- GSL_CXX_STANDARD: 17
|
|
||||||
USE_COMPILER: clang-cl
|
|
||||||
|
|
||||||
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_COMPILER: clang-cl
|
USE_TOOLSET: clang-cl
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
- C:\cmake-3.8.0-win32-x86
|
- C:\cmake-3.8.0-win32-x86
|
||||||
@ -55,8 +55,8 @@ before_build:
|
|||||||
$env:generator="$env:generator Win64"
|
$env:generator="$env:generator Win64"
|
||||||
}
|
}
|
||||||
echo generator="$env:generator"
|
echo generator="$env:generator"
|
||||||
if ("$env:USE_COMPILER=" -match "clang_cl") {
|
if ("$env:USE_TOOLSET=" -match "clang-cl") {
|
||||||
cmake .. -G "$env:generator" -T LLVM -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD"
|
cmake .. -G "$env:generator" -T llvm -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD"
|
||||||
}
|
}
|
||||||
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…
Reference in New Issue
Block a user