From c53869bfa6652ad397a54d6e9a1c4d9440fe129d Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 5 Sep 2017 11:04:27 +0200
Subject: [PATCH] [Appveyor] Fixing Conan usage.

---
 .appveyor.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 2c17fa2ec2a..d05a2f37648 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,7 +17,7 @@ configuration:
   - Release
 
 cache:
-  - C:\projects\deps\conan -> conanfile.py
+  - C:\projects\deps\conan -> scripts/cmake/ConanSetup.cmake
 
 install:
   # All external dependencies are installed in C:\projects\deps
@@ -25,8 +25,8 @@ install:
 
   # Install conan
   - if not exist "C:\projects\deps\conan\" mkdir C:\projects\deps\conan
-  - set PATH=%PATH%;%PYTHON%/Scripts/
-  - C:\Python27-x64\Scripts\pip.exe install conan
+  - set PATH=%PYTHON%/Scripts/;%PATH%
+  - pip.exe install conan --upgrade
   - conan remote add -i 0 ogs https://api.bintray.com/conan/ogs/conan
 
   # Install Ninja
@@ -44,8 +44,7 @@ before_build:
 
 build_script:
   - mkdir build & cd build
-  - conan install .. # -o gui=True
-  - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=%configuration% -DBUILD_SHARED_LIBS=OFF -DOGS_EIGEN_DYNAMIC_SHAPE_MATRICES=ON -DOGS_USE_PCH=OFF # -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_BUILD_GUI=ON
   - cmake --build . --config %configuration%
 
 test_script:
-- 
GitLab