diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-11-07 14:16:27 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-11-07 14:16:27 +0000 |
commit | e938aa1a5852bcef7f68502265582c39a3bb5508 (patch) | |
tree | 4e0bdcc818f63948707e851a1d2cfe0900b5959f /src/cmake/modules/GUDHI_user_version_target.cmake | |
parent | 060c31b9a7258f888b78b549229c024ba2316d5e (diff) | |
parent | 26197b2171b3e1b818a521690b27f15017f9b2a7 (diff) |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/periodic_cubical_complex_fix@2845 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 0c800159d0e87b051d5d4c5419adb903f7e6fa3b
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}) |