diff options
| -rw-r--r-- | .appveyor.yml | 10 | ||||
| -rw-r--r-- | src/python/CMakeLists.txt | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index ae40071a..122c4749 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -11,23 +11,23 @@ configuration: environment: # update the vcpkg cache even if build fails APPVEYOR_SAVE_CACHE_ON_ERROR: true + PYTHON: "C:\\Python37-x64" + CMAKE_GMP_FLAGS: -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" + CMAKE_MPFR_FLAGS: -DMPFR_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DMPFR_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpfr.lib" -DMPFR_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib/" + CMAKE_VCPKG_FLAGS: -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake 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: 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: Python CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON - PYTHON: "C:\\Python37-x64" cache: @@ -55,7 +55,7 @@ install: build_script: - mkdir build - cd build - - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DMPFR_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DMPFR_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpfr.lib" -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake .. + - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% %CMAKE_GMP_FLAGS% %CMAKE_MPFR_FLAGS% %CMAKE_VCPKG_FLAGS% .. - if [%target%]==[Python] ( cd src/python & type setup.py & diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 4da351a1..ba4f3e17 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -16,9 +16,11 @@ endfunction( add_GUDHI_PYTHON_lib ) function( add_GUDHI_PYTHON_lib_dir THE_LIB_DIR ) # deals when it is not set - error on windows - if(EXISTS ${THE_LIB_DIR}) - set(GUDHI_PYTHON_LIBRARY_DIRS "${GUDHI_PYTHON_LIBRARY_DIRS}'${THE_LIB_DIR}', ") - endif(EXISTS ${THE_LIB_DIR}) + foreach(LIB_DIR ${THE_LIB_DIR}) + if(EXISTS ${LIB_DIR}) + set(GUDHI_PYTHON_LIBRARY_DIRS "${GUDHI_PYTHON_LIBRARY_DIRS}'${LIB_DIR}', ") + endif(EXISTS ${LIB_DIR}) + endforeach() endfunction( add_GUDHI_PYTHON_lib_dir ) # THE_TEST is the python test file name (without .py extension) containing tests functions |