From 001ac1e827530a3b0e7411b77c37be89c95251c0 Mon Sep 17 00:00:00 2001
From: Kirk Shoop <kirk.shoop@microsoft.com>
Date: Thu, 4 Jun 2015 07:52:22 -0700
Subject: CMake - require 3.2 and refactor

NOTE: binaries have moved!
OSX
<build>/test/rxcppv2_test
<build>/examples/pythagorian/pythagorian
Windows
<build>\test\Debug\rxcppv2_test.exe
<build>\examples\pythagorian\Debug\pythagorian.exe
NOTE: cmake can be run in the root! This will make a dir named build
with the binaries
cmake .
cmake --build .
---
 appveyor.yml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'appveyor.yml')

diff --git a/appveyor.yml b/appveyor.yml
index 5697165..3f1a0ce 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.1.{build}
+version: 2.2.{build}
 
 branches:
 # whitelist
@@ -6,20 +6,26 @@ branches:
         - master
         - appveyor
 
+environment:
+  matrix:
+    - VSVER: Visual Studio 12 2013 Win64
+#    - VSVER: Visual Studio 14 2015 Win64
+
 install:
+    - choco install cmake
+    - choco upgrade cmake
+    - cmake --version
     - git submodule -q update --init
 
 before_build:
-    - mkdir projects\build
-    - cd projects\build
-    - cmake -G"Visual Studio 12" -T"v120" -B. ..\CMake\
-    - cd ..\..
+    - cmake -G"%VSVER%" .
 
 build:
-    project: projects\build\rxcpp.sln
+    project: build\rxcpp.sln
+
+test_script:
+  - build\test\Debug\rxcppv2_test.exe
 
 notifications:
-    - provider: Slack
-      auth_token:
-          secure: qaGjbI98VXZa7Zd2s3RmMzfA+ymrfWUDuzevdtOcHssEGBXbcoOJzLHNOmG+Y1nX
-      channel: rxcpp
+  slack:
+    secure: qaGjbI98VXZa7Zd2s3RmMzfA+ymrfWUDuzevdtOcHssEGBXbcoOJzLHNOmG+Y1nX
-- 
cgit v1.2.3