From f58f0bb2cb99076d0cd3a11ad39f3277213e3f5e Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 17:16:18 +0200 Subject: Shall be good --- .appveyor.yml | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) (limited to '.appveyor.yml') diff --git a/.appveyor.yml b/.appveyor.yml index cd562b75..31eb48d4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,21 +13,21 @@ environment: APPVEYOR_SAVE_CACHE_ON_ERROR: true 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" + - target: Examples + CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF + PYTHON: "C:\\Python37-x64" - target: UnitaryTests CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF PYTHON: "C:\\Python37-x64" -# - target: Utilities -# CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF -# PYTHON: "C:\\Python37-x64" + - target: Utilities + CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF + PYTHON: "C:\\Python37-x64" -# - 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" + - 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" cache: @@ -53,13 +53,11 @@ 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 .. - - MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 - - ctest -j 1 -C Release -R Alpha_complex_test_unit -V -# - 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 -# ) + - 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