diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-26 10:26:23 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-26 10:26:23 +0000 |
| commit | 88a606bd964144d8045fe91debbfcc77064a73a2 (patch) | |
| tree | 31af1548b2b09b487d3f3d6d9bd4cde3c9c85912 /src/cython | |
| parent | ad9c182c0ffa8b517cd20d174de823db05250514 (diff) | |
| parent | 69f1406e4cea402670fec98338055ce4fe48f8b0 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2013 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 28547c36fb65eea6cf30091678e132763c3d0507
Diffstat (limited to 'src/cython')
| -rw-r--r-- | src/cython/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/cython/gudhi.pyx.in | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 998908e7..6c49c800 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -75,10 +75,12 @@ if(PYTHON_PATH AND CYTHON_PATH) set(GUDHI_CYTHON_ALPHA_COMPLEX "include 'cython/alpha_complex.pyx'") set(GUDHI_CYTHON_TANGENTIAL_COMPLEX "include 'cython/tangential_complex.pyx'") + set(GUDHI_CYTHON_BOTTLENECK_DISTANCE "include 'cython/bottleneck_distance.pyx'") else (NOT CGAL_VERSION VERSION_LESS 4.8.0) # Remove alpha complex unitary tests file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test/test_alpha_complex.py) file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test/test_tangential_complex.py) + file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test/test_bottleneck_distance.py) endif (NOT CGAL_VERSION VERSION_LESS 4.8.0) endif (CGAL_FOUND) diff --git a/src/cython/gudhi.pyx.in b/src/cython/gudhi.pyx.in index 5dcb9d48..2d743d4d 100644 --- a/src/cython/gudhi.pyx.in +++ b/src/cython/gudhi.pyx.in @@ -33,3 +33,4 @@ include "cython/witness_complex.pyx" @GUDHI_CYTHON_ALPHA_COMPLEX@ @GUDHI_CYTHON_SUBSAMPLING@ @GUDHI_CYTHON_TANGENTIAL_COMPLEX@ +@GUDHI_CYTHON_BOTTLENECK_DISTANCE@ |