diff options
| author | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-06-27 01:03:45 +0000 |
|---|---|---|
| committer | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-06-27 01:03:45 +0000 |
| commit | d221f79cfb7d84941d791835e52fa4a596269cc6 (patch) | |
| tree | cde0df00ef5e7ec21c6a9e123e5d35bd7f5968f3 /src/cmake/modules/GUDHI_user_version_target.cmake | |
| parent | 0741c3eabbfece1c73ac76aa44adbe2904b6124d (diff) | |
| parent | 5645e9fcbe5730462b2befb8685d3bb6857279be (diff) | |
merged trunk
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/kernels@3644 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 2be9ba6b6a381e677081a751e7d8f8c1d79385b0
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, 3 insertions, 3 deletions
diff --git a/src/cmake/modules/GUDHI_user_version_target.cmake b/src/cmake/modules/GUDHI_user_version_target.cmake index 4abc2574..1205966a 100644 --- a/src/cmake/modules/GUDHI_user_version_target.cmake +++ b/src/cmake/modules/GUDHI_user_version_target.cmake @@ -48,10 +48,10 @@ 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") - if (NOT CGAL_VERSION VERSION_GREATER 4.11.0) - set(GUDHI_INCLUDE_DIRECTORIES "include/gudhi;include/gudhi_patches") + if (CGAL_VERSION VERSION_LESS 4.11.0) + set(GUDHI_INCLUDE_DIRECTORIES "include/gudhi;include/Miniball;include/gudhi_patches") else () - set(GUDHI_INCLUDE_DIRECTORIES "include/gudhi") + set(GUDHI_INCLUDE_DIRECTORIES "include/gudhi;include/Miniball") endif () foreach(GUDHI_MODULE ${GUDHI_MODULES_FULL_LIST}) |