diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-08-21 14:25:24 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-08-21 14:25:24 +0000 |
| commit | 5f82230750f45e348fb1eee9c45b84710b669c38 (patch) | |
| tree | aeda306bcc15138ba9275c32131604c99475520a /src/cmake/modules/GUDHI_third_party_libraries.cmake | |
| parent | 6166aad3e082119ead02413659cfb6ea2e661ef7 (diff) | |
| parent | ef36c8b63bc353ac9d4e6982b9bba6797d546e51 (diff) | |
Merge persistence diagram improvement branch
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@2614 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: eaccfe6c60c4a05bbec173a1042db7ad490a9f37
Diffstat (limited to 'src/cmake/modules/GUDHI_third_party_libraries.cmake')
| -rw-r--r-- | src/cmake/modules/GUDHI_third_party_libraries.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake index 8f486118..dbf2106a 100644 --- a/src/cmake/modules/GUDHI_third_party_libraries.cmake +++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake @@ -117,15 +117,13 @@ if(NOT GUDHI_CYTHON_PATH) endif(NOT GUDHI_CYTHON_PATH) if(PYTHONINTERP_FOUND AND CYTHON_FOUND) - # Unitary tests are available through py.test - find_program( PYTEST_PATH py.test ) # Default found version 2 if(PYTHON_VERSION_MAJOR EQUAL 2) # Documentation generation is available through sphinx find_program( SPHINX_PATH sphinx-build ) elseif(PYTHON_VERSION_MAJOR EQUAL 3) # No sphinx-build in Pyton3, just hack it - set(SPHINX_PATH "${CMAKE_SOURCE_DIR}/${GUDHI_CYTHON_PATH}/doc/python3-sphinx-build") + 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) |