diff options
| author | Gard Spreemann <gspreemann@gmail.com> | 2018-06-15 12:34:03 +0200 |
|---|---|---|
| committer | Gard Spreemann <gspreemann@gmail.com> | 2018-06-15 12:34:03 +0200 |
| commit | 41482b4260b4aff3d6803e340d5c94fbefb9af67 (patch) | |
| tree | 89eae43dcb3fd4ab040e96f3d5479427d8cd2c7f /cmake/modules/GUDHI_user_version_target.cmake | |
| parent | 41a1b8c2728e212c832c0384c8bb424139a247cf (diff) | |
| parent | c524232f734de875d69e2f190f01a6c976024368 (diff) | |
Merge branch 'upstream/latest' into dfsg/latest
Diffstat (limited to 'cmake/modules/GUDHI_user_version_target.cmake')
| -rw-r--r-- | cmake/modules/GUDHI_user_version_target.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/modules/GUDHI_user_version_target.cmake b/cmake/modules/GUDHI_user_version_target.cmake index 4abc2574..1205966a 100644 --- a/cmake/modules/GUDHI_user_version_target.cmake +++ b/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}) |