diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-01 17:58:07 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-01 17:58:07 +0000 |
| commit | fcfc9de5eb7e309c0ac309f57e26672c31bbc836 (patch) | |
| tree | 720e8121688e8523f2096c30e51836e89067a0ec /src/cython/CMakeLists.txt | |
| parent | d7d59f1e4245af3595c8eafd0abc0abdc4b5805d (diff) | |
Add Subsampling cpp interface and cython
Remove deref cyton import
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1809 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 2dc0469d2401e0c99e879c064a0f608c8ba78ed6
Diffstat (limited to 'src/cython/CMakeLists.txt')
| -rw-r--r-- | src/cython/CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 2746cab9..c2026682 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -49,8 +49,16 @@ if(PYTHON_PATH AND CYTHON_PATH) file(COPY test DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) if (CGAL_FOUND) + if (NOT CGAL_VERSION VERSION_LESS 4.8.1) + # If CGAL_VERSION >= 4.8.1, include subsampling + # CGAL things are done in CGAL_VERSION >= 4.8.0 + set(GUDHI_CYTHON_SUBSAMPLING "include 'cython/subsampling.pyx'") + else (NOT CGAL_VERSION VERSION_LESS 4.8.1) + # Remove alpha complex unitary tests + file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test/test_subsampling.py) + endif (NOT CGAL_VERSION VERSION_LESS 4.8.1) if (NOT CGAL_VERSION VERSION_LESS 4.8.0) - # If CGAL_VERSION >= 4.8.0, include alpha complex + # If CGAL_VERSION >= 4.8.0, include alpha and tangential complex set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'CGAL', ") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ") # GMP and GMPXX are not required, but if present, CGAL will link with them. |