Merge branch 'master' into persistence_intervals_numpy_arrays_vincent

1 files changed, 47 insertions, 53 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index 86199265..31eb48d4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,69 +1,63 @@
-# Specify version format
-version: "{build}"
-
 image:
   - Visual Studio 2017
 
-platform:
-  - x64
-
-# specify custom environment variables
-environment:
-  APPVEYOR_SAVE_CACHE_ON_ERROR: true
+build:
+  parallel: true
+  verbosity: detailed
 
-# build configuration, i.e. Debug, Release, etc.
 configuration:
-  - Debug
   - Release
 
-# scripts that are called at very beginning, before repo cloning
-init:
-  - cmd: cmake --version
-  - cmd: msbuild /version
+environment:
+  # update the vcpkg cache even if build fails
+  APPVEYOR_SAVE_CACHE_ON_ERROR: true
 
-# scripts that run after cloning repository
-install:
-  #------------------
-  # Windows 10
-  #------------------
-  # update vcpkg
-  - cmd: cd C:\tools\vcpkg
-  - cmd: git pull
-  - cmd: .\bootstrap-vcpkg.bat
+  matrix:
+      - target: Examples
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF
+        PYTHON: "C:\\Python37-x64"
 
-  - cmd: if "%platform%"=="Win32" set VCPKG_ARCH=x86-windows
-  - cmd: if "%platform%"=="x64"   set VCPKG_ARCH=x64-windows
+      - target: UnitaryTests
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF
+        PYTHON: "C:\\Python37-x64"
 
-  # remove outdated versions
-  - cmd: vcpkg remove --outdated --recurse
+      - target: Utilities
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF
+        PYTHON: "C:\\Python37-x64"
 
-  # install required dependencies
-  - cmd: vcpkg install --recurse --triplet %VCPKG_ARCH% zlib boost-date-time boost-program-options boost-system boost-serialization boost-thread boost-units tbb eigen3 cgal[core]
+      - target: Python
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib"
+        PYTHON: "C:\\Python37-x64"
 
-  - cmd: vcpkg integrate install
-  - cmd: cd "%APPVEYOR_BUILD_FOLDER%"
 
-# preserve contents of selected directories and files across project builds
-for:
--
-  matrix:
-    only:
-      - image: Visual Studio 2017
-  cache:
-    - 'C:\tools\vcpkg\installed'
+cache:
+  - c:\Tools\vcpkg\installed
+  - '%LOCALAPPDATA%\pip\Cache'
 
-build_script:
-  # get VCG library
-  - git clone https://github.com/GUDHI/gudhi-devel.git
+init:
+  - echo %target%
 
-  #------------------
-  # Windows 10
-  #------------------
-  - cmd: if "%platform%"=="Win32" set CMAKE_GENERATOR=-G"Visual Studio 15 2017"
-  - cmd: if "%platform%"=="x64"   set CMAKE_GENERATOR=-G"Visual Studio 15 2017 Win64"
-  - cmd: mkdir build && cd build
-  - cmd: cmake %CMAKE_GENERATOR% -DCMAKE_BUILD_TYPE=%Configuration% -DCMAKE_TOOLCHAIN_FILE="C:\tools\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCG_ROOT="%APPVEYOR_BUILD_FOLDER%\VCG" ..
-  - cmd: cmake --build . --target ALL_BUILD --config %Configuration% -- /maxcpucount:4
 
-test_script:
-  - cmd: ctest --build-config %Configuration% --output-on-failure
+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 mpfr:x64-windows mpir:x64-windows cgal:x64-windows
+  - SET PATH=c:\Tools\vcpkg\installed\x64-windows\bin;%PATH%
+  - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PYTHON%\Library\bin;%PATH%
+  - SET PYTHONPATH=%PYTHON%\\Lib\\site-packages;%PYTHONPATH%
+  - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+  - python --version
+  - pip --version
+  - python -m pip install --upgrade pip
+  - 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 [%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
+    )