From 248452f0958f52185e702bccac2cf1f7e156e159 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Mon, 27 May 2019 10:56:49 +0200
Subject: Let's try to fix conditional python

---
 .appveyor.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 1334004b..3cf5d71b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -24,7 +24,7 @@ environment:
 
       - target: Python
         CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON
-        PYTHON: "C:\\Python36-x64"
+        PYTHON: "C:\\Python37-x64"
 
 
 cache:
@@ -37,15 +37,21 @@ init:
 
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
-  - if "%target%"=="Python" "%PYTHON%\\python.exe --version"
-  - if "%target%"=="Python" "%PYTHON%\\python.exe -m pip install -U pip setuptools numpy matplotlib scipy Cython pytest"
+  - if [%target%]==[Python] (
+      SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+      python --version
+      pip version
+      pip install -U setuptools numpy matplotlib scipy Cython pytest )
 
 build_script:
   - mkdir build
   - cd build
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-  - if NOT "%target%"=="Python" MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
-  - if NOT "%target%"=="Python" ctest -j 1 -C Release -E diff_files
-  - if "%target%"=="Python" cd src/cython
-  - if "%target%"=="Python" "%PYTHON%\\python.exe setup.py install"
-  - if "%target%"=="Python" MSBuild RUN_TESTS.vcxproj
+  - if [%target%]==[Python] (
+      cd src/cython
+      python setup.py install
+      MSBuild RUN_TESTS.vcxproj
+    ) else (
+      MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
+      ctest -j 1 -C Release -E diff_files
+    )
-- 
cgit v1.2.3