diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-09-12 12:45:20 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-09-12 12:45:20 +0000 |
| commit | 90f4783f287e266d3d8787d0d18b84d27f8b96b6 (patch) | |
| tree | 590a3487508047c5aff5e6befa4635df94eb6ca8 /src/cmake | |
| parent | 3dd4db9ad872eecae58e6edf3c16915ca1ec7ccc (diff) | |
Modification rollback
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/cythonization_improvement@2665 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 2f977f8b93c6104d2b7c8f16c13da974b36f1535
Diffstat (limited to 'src/cmake')
| -rw-r--r-- | src/cmake/modules/GUDHI_third_party_libraries.cmake | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake index 799d28b6..dbf2106a 100644 --- a/src/cmake/modules/GUDHI_third_party_libraries.cmake +++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake @@ -122,13 +122,8 @@ if(PYTHONINTERP_FOUND AND CYTHON_FOUND) # Documentation generation is available through sphinx find_program( SPHINX_PATH sphinx-build ) elseif(PYTHON_VERSION_MAJOR EQUAL 3) - execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from sphinx import main" - RESULT_VARIABLE SPHINX_MODULE_IS_INSTALLED) - message(" --- SPHINX_MODULE_IS_INSTALLED --- ${SPHINX_MODULE_IS_INSTALLED}") - if(SPHINX_MODULE_IS_INSTALLED) - # No sphinx-build in Pyton3, just hack it - set(SPHINX_PATH "${CMAKE_CURRENT_BINARY_DIR}/${GUDHI_CYTHON_PATH}/doc/python3-sphinx-build") - endif(SPHINX_MODULE_IS_INSTALLED) + # No sphinx-build in Pyton3, just hack it + set(SPHINX_PATH "${CMAKE_CURRENT_BINARY_DIR}/${GUDHI_CYTHON_PATH}/doc/python3-sphinx-build") else() message(FATAL_ERROR "ERROR: Try to compile the Cython interface. Python version ${PYTHON_VERSION_STRING} is not valid.") endif(PYTHON_VERSION_MAJOR EQUAL 2) |