diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-11-23 11:49:15 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-11-23 11:49:15 +0000 |
| commit | f843ef3f8e4ab4ce94a28ded6d8cafd37f2b2311 (patch) | |
| tree | 7d053afbeb51a16916da07f932deecc364c7eb42 /src/cython/CMakeLists.txt | |
| parent | 8d656e33138ef8b3a7d86a7375c92646efc29511 (diff) | |
Add tangential complex
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1773 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: b47285aafaa430c883c8fe5432ac667d6cedaf37
Diffstat (limited to 'src/cython/CMakeLists.txt')
| -rw-r--r-- | src/cython/CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 81fbe8fe..09ebb678 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -45,8 +45,8 @@ if(PYTHON_PATH AND CYTHON_PATH) file(COPY test DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) if (CGAL_FOUND) - if (NOT CGAL_VERSION VERSION_LESS 4.7.0) - # If CGAL_VERSION >= 4.7.0, include alpha complex + if (NOT CGAL_VERSION VERSION_LESS 4.8.0) + # If CGAL_VERSION >= 4.8.0, include alpha 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. @@ -62,10 +62,12 @@ if(PYTHON_PATH AND CYTHON_PATH) endif(GMP_FOUND) set(GUDHI_CYTHON_ALPHA_COMPLEX "include 'cython/alpha_complex.pyx'") - else (NOT CGAL_VERSION VERSION_LESS 4.7.0) + set(GUDHI_CYTHON_TANGENTIAL_COMPLEX "include 'cython/tangential_complex.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) - endif (NOT CGAL_VERSION VERSION_LESS 4.7.0) + file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test/test_tangential_complex.py) + endif (NOT CGAL_VERSION VERSION_LESS 4.8.0) endif (CGAL_FOUND) # Loop on INCLUDE_DIRECTORIES PROPERTY |