From 52602ed8accedd6ed71a4ec83fa52543e2cdc12d Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Wed, 23 May 2018 09:42:27 -0400
Subject: [PATCH] Adding VS 2017 64 bit to Appveyor build matrix

---
 appveyor.yml | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b2e1dad..b477a93 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,8 +9,25 @@
 
 version: 2.0.{build}
 
-image: 
-  - Visual Studio 2013
+matrix: 
+  allow_failures:
+  #GROUP: (SUPPORTED/EXPERIMENTAL)
+  #EXPERIMENTAL is allowed to fail under build matrix
+  - GROUP: "EXPERIMENTAL"
+
+environment: 
+  matrix:
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+    VS_VERSION: "10 2010"
+    ARCH: Win32
+    GROUP: "SUPPORTED"
+    BOOST_ROOT:"C:/Libraries/boost"
+    # New build on Visual Studio 15 2017
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    VS_VERSION: "15 2017"
+    ARCH: Win64
+    GROUP: "EXPERIMENTAL"
+    BOOST_ROOT:"C:/Libraries/boost_1_67_0"
 
 # called before repo cloning
 init: 
@@ -18,9 +35,14 @@ init:
   - set BUILD_HOME=buildprod
   - set TEST_HOME=nrtestsuite
   - set NRTEST_SCRIPT=C:\Python27\Scripts
-  - set GENERATOR="Visual Studio 10 2010"
-  - set BOOST_ROOT="C:\\Libraries\\boost"
-  - set BOOST_LIB="C:\\Libraries\\boost\\lib32-msvc-12.0"
+  - if "%ARCH%"=="Win64" (set VS_ARCH=Win64)
+  - set GENERATOR="Visual Studio %VS_VERSION%%VS_ARCH%"
+  # See values set
+  - echo %APPVEYOR_BUILD_WORKER_IMAGE%
+  - echo %ARCH%
+  - echo %BUILD_HOME%
+  - echo %GENERATOR%
+  - echo %BOOST_ROOT%
 
 # called after repo clone
 install: 
@@ -32,7 +54,6 @@ before_build:
   - cd %BUILD_HOME%
   - cmake -G %GENERATOR% 
     -DBOOST_ROOT="%BOOST_ROOT%"
-    -DBOOST_LIBRARYDIR="%BOOST_LIB%"
     -DBoost_USE_STATIC_LIBS="ON" ..
 
 # run custom build script