From a7f345aa0dfe2a5ec2b45720c3e0390c3c843f51 Mon Sep 17 00:00:00 2001
From: arvidn <arvid@libtorrent.org>
Date: Sat, 10 Nov 2018 01:38:20 +0100
Subject: [PATCH] split out cmake build on appveyor

---
 appveyor.yml | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a01c22b66..98a87a079 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,28 +8,36 @@ os: Visual Studio 2015
 clone_depth: 1
 environment:
   matrix:
+  - cmake: 1
   - variant: test_debug
     compiler: msvc-14.0
     model: 64
     sim: 1
+    bjam: 1
   - variant: test_debug
     compiler: msvc-14.0
     model: 32
+    bjam: 1
   - variant: test_release
     compiler: msvc-14.0
     model: 64
     python: 1
     crypto: openssl
-    cmake: 1
+    bjam: 1
   - variant: test_debug
     compiler: gcc
     model: 32
     crypto: openssl
+    bjam: 1
 
 install:
 - git submodule update --init --recursive
 - set ROOT_DIRECTORY=%CD%
 - cd %ROOT_DIRECTORY%
+- if not defined compiler ( set compiler="" )
+- if not defined crypto ( set crypto=built-in )
+- if not defined linkflags ( set linkflags="" )
+- if not defined include ( set include="" )
 - if %compiler% == msvc-14.0 if defined crypto if not exist openssl-1.0.1p-vs2015.7z (
     echo downloading openssl-2015
     & appveyor DownloadFile "https://www.npcglib.org/~stathis/downloads/openssl-1.0.1p-vs2015.7z"
@@ -43,9 +51,6 @@ install:
     & copy c:\openssl\lib\ssleay32MT.lib c:\openssl\lib\ssleay32.lib
     & copy c:\openssl\lib\libeay32MT.lib c:\openssl\lib\libeay32.lib
   )
-- if not defined crypto ( set crypto=built-in )
-- if not defined linkflags ( set linkflags="" )
-- if not defined include ( set include="" )
 - cd %ROOT_DIRECTORY%
 - set BOOST_ROOT=c:\Libraries\boost_1_63_0
 - set BOOST_BUILD_PATH=%BOOST_ROOT%\tools\build
@@ -67,17 +72,24 @@ cache:
 - openssl-1.0.1p-vs2015.7z
 
 build_script:
+
 # examples
 - cd %ROOT_DIRECTORY%\examples
-- b2.exe --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto%
+- if defined bjam (
+  b2.exe --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto%
+  )
 
 # tools
 - cd %ROOT_DIRECTORY%\tools
-- b2.exe --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto%
+- if defined bjam (
+  b2.exe --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto%
+  )
 
 # test
 - cd %ROOT_DIRECTORY%\test
-- b2.exe --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto% win-tests test_upnp test_natpmp testing.execute=off
+- if defined bjam (
+  b2.exe --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto% win-tests test_upnp test_natpmp testing.execute=off
+  )
 
 # python binding
 - cd %ROOT_DIRECTORY%\bindings\python
@@ -103,7 +115,9 @@ build_script:
 
 test_script:
 - cd %ROOT_DIRECTORY%\test
-- appveyor-retry b2.exe -l400 --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto% win-tests
+- if defined bjam (
+  appveyor-retry b2.exe -l400 --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto% win-tests
+  )
 
 - cd %ROOT_DIRECTORY%\bindings\python
 # we use 64 bit python build
@@ -112,6 +126,10 @@ test_script:
   & c:\Python35-x64\python.exe test.py -b
   )
 
+- if defined cmake (
+  appveyor-retry ctest
+  )
+
 # simulation tests
 # debug iterators are turned off here because msvc has issues with noexcept
 # specifiers when debug iterators are enabled. Specifically, constructors that