diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-05-28 10:59:36 +0200 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-05-28 10:59:36 +0200 |
| commit | 20e57ccc35ef216bec5b1252b41a4aa1da566610 (patch) | |
| tree | 4e08e42a50e523432d559dffc87f6bfd27c77967 | |
| parent | 851afaab00a47f1469cb5819b4a26ea52bad988b (diff) | |
Let's try this
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | src/cmake/modules/GUDHI_third_party_libraries.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index d48ec43e..d072a366 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -59,7 +59,7 @@ build_script: - if [%target%]==[Python] ( cd src/python & MSBuild Cython.sln /m /p:Configuration=Release /p:Platform=x64 & - ctest -j 1 --output-on-failure -C Release -E sphinx + ctest -j 1 --output-on-failure -C Release ) else ( MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & ctest -j 1 --output-on-failure -C Release -E diff_files diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7b5334a7..29ec23d0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,5 +33,5 @@ jobs: cmake -DCMAKE_BUILD_TYPE:STRING=$(cmakeBuildType) -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 .. make -j 4 make doxygen - ctest -j 4 --output-on-failure -E sphinx # remove sphinx build as it fails + ctest -j 4 --output-on-failure # -E sphinx remove sphinx build as it fails displayName: 'Build, test and documentation generation' diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake index 49295a82..f92fe93e 100644 --- a/src/cmake/modules/GUDHI_third_party_libraries.cmake +++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake @@ -199,7 +199,7 @@ if(PYTHONINTERP_FOUND AND CYTHON_FOUND) if(NOT SPHINX_PATH) if(PYTHON_VERSION_MAJOR EQUAL 3) # In Python3, just hack sphinx-build if it does not exist - set(SPHINX_PATH "${PYTHON_EXECUTABLE}" "-m sphinx.cmd.build") + set(SPHINX_PATH "${PYTHON_EXECUTABLE}" "-m" "sphinx.cmd.build") endif(PYTHON_VERSION_MAJOR EQUAL 3) endif(NOT SPHINX_PATH) endif(SPHINX_FOUND) |