diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-11-16 17:48:57 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-11-16 17:48:57 +0000 |
| commit | 4036005c0302fa7ce72ef2966bda73049da6be41 (patch) | |
| tree | 0f99f40bbf0efe3161febd2528807507f0387da5 /src/cmake/modules/GUDHI_third_party_libraries.cmake | |
| parent | a81f82e1751846495c5f02fb1486ae5b574d8232 (diff) | |
| parent | 0b38e753e73af22391788f0bb92fc3ddb49f6938 (diff) | |
Merge last trunk modifications
Fix copyright issues
Add Nerve_GIC as examples
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Nerve_GIC@2897 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: ee046c4c043c7fb76f4b2ad6772229f3a837ae8f
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() |