From 4e38b36c15611e357e74cfbbb4a8f990b70a340a Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 17 Jul 2018 15:09:55 +0200
Subject: [PATCH] [appveyor] Bumped Visual Studio to 2017, never build Conan
packages.
VTK 8.1 binary packages are built for 2017 only.
---
.appveyor.yml | 7 +++----
ThirdParty/cmake-modules | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
index ac4a23ba1e2..7fc02aae216 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,7 +2,7 @@ version: 6.0.8.{build}
clone_depth: 100
image:
- - Visual Studio 2015
+ - Visual Studio 2017
environment:
PYTHON: "C:\\Python27-x64"
@@ -52,14 +52,13 @@ clone_script:
}
before_build:
- - call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
- - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
+ - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\vsdevcmd" -arch=x64
- cd %APPVEYOR_BUILD_FOLDER%
- echo %APPVEYOR_BUILD_FOLDER%
build_script:
- mkdir build & cd build
- - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=%configuration% -DBUILD_SHARED_LIBS=OFF -DOGS_EIGEN_DYNAMIC_SHAPE_MATRICES=ON -DOGS_USE_PCH=OFF -DOGS_USE_CONAN=ON # -DOGS_BUILD_GUI=ON
+ - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=%configuration% -DBUILD_SHARED_LIBS=OFF -DOGS_EIGEN_DYNAMIC_SHAPE_MATRICES=ON -DOGS_USE_PCH=OFF -DOGS_USE_CONAN=ON -DOGS_CONAN_BUILD=never # -DOGS_BUILD_GUI=ON
- cmake --build . --config %configuration%
- cmake --build . --config %configuration% --target tests
- cmake --build . --config %configuration% --target ctest
diff --git a/ThirdParty/cmake-modules b/ThirdParty/cmake-modules
index 72b1081914e..28c3f604615 160000
--- a/ThirdParty/cmake-modules
+++ b/ThirdParty/cmake-modules
@@ -1 +1 @@
-Subproject commit 72b1081914e339350bb529701df84180dddda098
+Subproject commit 28c3f6046151f88b338d46e5d3149e89e1bf1d15
--
GitLab