diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-11-09 12:48:49 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-11-09 12:48:49 +0000 |
| commit | 98646a5bcece4a6474eff824de2b25510e005a59 (patch) | |
| tree | 27e49fd43dcac6ac4249077f1f5be27aae26070d /src/cmake/modules/GUDHI_user_version_target.cmake | |
| parent | 0729a55a67503c068e4843c63930d6b29e76f7ac (diff) | |
| parent | 1e229960b1ee38adc1a41b2cc323ffbd8b7bb921 (diff) | |
Merge last trunk modifications
Comment some bad code
Try to cythonize rips from correlation matrix
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/rips_complex_from_correlation_matrix@2858 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 3b9bcdfdeae247ed5486e20cb62f2812fdd14b0d
Diffstat (limited to 'src/cmake/modules/GUDHI_user_version_target.cmake')
| -rw-r--r-- | src/cmake/modules/GUDHI_user_version_target.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cmake/modules/GUDHI_user_version_target.cmake b/src/cmake/modules/GUDHI_user_version_target.cmake index cff64ad2..4abc2574 100644 --- a/src/cmake/modules/GUDHI_user_version_target.cmake +++ b/src/cmake/modules/GUDHI_user_version_target.cmake @@ -48,7 +48,11 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.11) copy_directory ${CMAKE_SOURCE_DIR}/src/GudhUI ${GUDHI_USER_VERSION_DIR}/GudhUI) set(GUDHI_DIRECTORIES "doc;example;concept;utilities") - set(GUDHI_INCLUDE_DIRECTORIES "include/gudhi;include/gudhi_patches") + if (NOT CGAL_VERSION VERSION_GREATER 4.11.0) + set(GUDHI_INCLUDE_DIRECTORIES "include/gudhi;include/gudhi_patches") + else () + set(GUDHI_INCLUDE_DIRECTORIES "include/gudhi") + endif () foreach(GUDHI_MODULE ${GUDHI_MODULES_FULL_LIST}) foreach(GUDHI_DIRECTORY ${GUDHI_DIRECTORIES}) |