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_third_party_libraries.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_third_party_libraries.cmake')
| -rw-r--r-- | src/cmake/modules/GUDHI_third_party_libraries.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake index f2bbafdc..8269c3bf 100644 --- a/src/cmake/modules/GUDHI_third_party_libraries.cmake +++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake @@ -54,10 +54,12 @@ if(CGAL_FOUND) endforeach(CGAL_INCLUDE_DIR ${CGAL_INCLUDE_DIRS}) endif(NOT CGAL_VERSION VERSION_GREATER 4.9.0) - # For dev version - include_directories(BEFORE "src/common/include/gudhi_patches") - # For user version - include_directories(BEFORE "include/gudhi_patches") + if (NOT CGAL_VERSION VERSION_GREATER 4.11.0) + # For dev version + include_directories(BEFORE "src/common/include/gudhi_patches") + # For user version + include_directories(BEFORE "include/gudhi_patches") + endif (NOT CGAL_VERSION VERSION_GREATER 4.11.0) endif() endif() |