From c56b17029afb2c1f163f295f3333f9a07bb3dbe6 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Sat, 1 Jun 2019 06:47:48 -0700
Subject: [PATCH] Add msvc2019 to CI

---
 support/appveyor-build.py | 19 +++++++++++--------
 support/appveyor.yml      | 16 ++++++++++++----
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/support/appveyor-build.py b/support/appveyor-build.py
index 2cfcb03a..65446103 100644
--- a/support/appveyor-build.py
+++ b/support/appveyor-build.py
@@ -23,14 +23,17 @@ else:
     # Add MSBuild 14.0 to PATH as described in
     # http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc.
     os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\15.0\Bin;' + path
-    if image == 'Visual Studio 2013':
-        generator = 'Visual Studio 12 2013'
-    elif image == 'Visual Studio 2015':
-        generator = 'Visual Studio 14 2015'
-    elif image == 'Visual Studio 2017':
-        generator = 'Visual Studio 15 2017'
-    if platform == 'x64':
-        generator += ' Win64'
+    if image == 'Visual Studio 2019':
+        generator = 'Visual Studio 16 2019'
+        if platform == 'x64':
+            cmake_command.extend(['-A', 'x64'])
+    else:
+        if image == 'Visual Studio 2015':
+            generator = 'Visual Studio 14 2015'
+        elif image == 'Visual Studio 2017':
+            generator = 'Visual Studio 15 2017'
+        if platform == 'x64':
+            generator += ' Win64'
     cmake_command.append('-G' + generator)
     build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:4']
     test_command = ['ctest', '-C', config]
diff --git a/support/appveyor.yml b/support/appveyor.yml
index 525cbe0e..f53e4383 100644
--- a/support/appveyor.yml
+++ b/support/appveyor.yml
@@ -4,19 +4,27 @@ configuration:
 
 clone_depth: 1
 
+image:
+  - Visual Studio 2015
+  - Visual Studio 2019
+  - Visual Studio 2017
+
 platform:
   - Win32
   - x64
 
-image:
-  - Visual Studio 2015
-  - Visual Studio 2017
-
 environment:
   CTEST_OUTPUT_ON_FAILURE: 1
   MSVC_DEFAULT_OPTIONS: ON
   BUILD: msvc
 
+matrix:
+  exclude:
+    - image: Visual Studio 2015
+      platform: Win32
+    - image: Visual Studio 2019
+      platform: Win32
+
 before_build:
  - mkdir build
  - cd build