Skip to content

Commit d1c9e2c

Browse files
Added appveyor Visual Studio 2015 test environment
1 parent 4ea29be commit d1c9e2c

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

appveyor.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Specify version format
22
version: "{build}"
33

4-
# Operating system (build VM template)
5-
os: Windows Server 2012 R2
6-
#os: unstable
74

85
# build platform, i.e. Win32 (instead of x86), x64, Any CPU. This setting is optional.
96
platform:
@@ -12,9 +9,14 @@ platform:
129

1310
# specify custom environment variables
1411
environment:
15-
BOOST_ROOT: C:\Libraries\boost
16-
BOOST_LIBRARYDIR_WIN32: C:\Libraries\boost\lib32-msvc-12.0
17-
BOOST_LIBRARYDIR_WIN64: C:\Libraries\boost\lib64-msvc-12.0
12+
MSVC_DEFAULT_OPTIONS: ON
13+
BOOST_ROOT: C:\Libraries\boost_1_63_0
14+
matrix:
15+
- GENERATOR: "Visual Studio 12 2013"
16+
os: Visual Studio 2015
17+
- GENERATOR: "Visual Studio 14 2015"
18+
os: Visual Studio 2015
19+
1820
# build Configuration, i.e. Debug, Release, etc.
1921
configuration:
2022
- Debug
@@ -30,10 +32,6 @@ clone_folder: C:\projects\mfast
3032

3133
# branches to build
3234
branches:
33-
#whitelist
34-
# only:
35-
# - master
36-
# blacklist
3735
except:
3836
- gh-pages
3937
- emdi
@@ -48,9 +46,8 @@ before_build:
4846
- cmd: cd C:\projects\mfast
4947
- cmd: md build
5048
- cmd: cd build
51-
# We generate project files for Visual Studio 12 because the boost binaries installed on the test server are for Visual Studio 12.
52-
- cmd: if "%platform%"=="Win32" cmake -G "Visual Studio 12" -DCMAKE_BUILD_TYPE=%configuration% -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR_WIN32%" -DBoost_USE_STATIC_LIBS="ON" ..
53-
- cmd: if "%platform%"=="x64" cmake -G "Visual Studio 12 Win64" -DCMAKE_BUILD_TYPE=%configuration% -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR_WIN64%" -DBoost_USE_STATIC_LIBS="ON" ..
49+
- cmd: if "%platform%"=="Win32" cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%configuration% -DBOOST_ROOT="%BOOST_ROOT%" ..
50+
- cmd: if "%platform%"=="x64" cmake -G "%GENERATOR% Win64" -DCMAKE_BUILD_TYPE=%configuration% -DBOOST_ROOT="%BOOST_ROOT%" ..
5451

5552
build:
5653
project: C:\projects\mfast\build\mfast.sln

0 commit comments

Comments
 (0)