diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2014-12-18 14:39:50 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2014-12-18 14:39:50 +0000 |
| commit | bf1aaf74846347d7eef70f66d96a19654aabc242 (patch) | |
| tree | 06be1fe42772d2637b49ec63892d101d4c9fa361 /src | |
| parent | 555a4f62e6a19a51ac16cd0a90535c33bbade178 (diff) | |
CGAL version
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@384 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 302b240369c51d23deb38a72436e414d4250dc1d
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/Simplex_tree/include/gudhi/Simplex_tree.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dcdf6e87..b15cfe98 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,6 +18,12 @@ endif() add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE) find_package(Boost) +find_package(GMP) +if(GMP_FOUND) + find_package(GMPXX) +endif() +find_package(CGAL 4.4) + if(NOT Boost_FOUND) message(FATAL_ERROR "NOTICE: This demo requires Boost and will not be compiled.") else() diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h index 95f26510..c866d179 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h @@ -38,7 +38,7 @@ namespace Gudhi { - +/** \defgroup simplex_tree Filtered Complexes /** \defgroup simplex_tree Filtered Complexes * * A simplicial complex \f$\mathbf{K}\f$ @@ -117,8 +117,7 @@ class Simplex_tree { friend class Simplex_tree_complex_simplex_iterator< Simplex_tree<FiltrationValue, SimplexKey, VertexHandle> >; friend class Simplex_tree_skeleton_simplex_iterator< Simplex_tree<FiltrationValue, SimplexKey, VertexHandle> >; - - + /* \brief Set of nodes sharing a same parent in the simplex tree. */ /* \brief Set of nodes sharing a same parent in the simplex tree. */ typedef Simplex_tree_siblings<Simplex_tree, Dictionary> Siblings; |