diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-08-20 17:05:13 +0200 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-08-20 17:05:13 +0200 |
| commit | 87a8d7962ea13f11e591462ec5757e9e1747dc07 (patch) | |
| tree | 5f1ca83e20cec1be410b119622177d2a3b5ae043 /src/Witness_complex | |
| parent | ed59f5bf1b35269cf4324dbb72df863bf50dac01 (diff) | |
Fix issue #10 and modify main and installation documentations accordingly
Diffstat (limited to 'src/Witness_complex')
| -rw-r--r-- | src/Witness_complex/include/gudhi/Euclidean_strong_witness_complex.h | 14 | ||||
| -rw-r--r-- | src/Witness_complex/include/gudhi/Euclidean_witness_complex.h | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/src/Witness_complex/include/gudhi/Euclidean_strong_witness_complex.h b/src/Witness_complex/include/gudhi/Euclidean_strong_witness_complex.h index c9767982..7d3c2d6d 100644 --- a/src/Witness_complex/include/gudhi/Euclidean_strong_witness_complex.h +++ b/src/Witness_complex/include/gudhi/Euclidean_strong_witness_complex.h @@ -5,6 +5,7 @@ * Copyright (C) 2015 Inria * * Modification(s): + * - 2019/08 Vincent Rouvreau: Fix issue #10 for CGAL and Eigen3 * - YYYY/MM Author: Description of the modification */ @@ -15,9 +16,22 @@ #include <gudhi/Active_witness/Active_witness.h> #include <gudhi/Kd_tree_search.h> +#include <CGAL/version.h> // for CGAL_VERSION_NR + +#include <Eigen/src/Core/util/Macros.h> // for EIGEN_VERSION_AT_LEAST + #include <utility> #include <vector> +// Make compilation fail - required for external projects - https://github.com/GUDHI/gudhi-devel/issues/10 +#if CGAL_VERSION_NR < 1041101000 +# error Alpha_complex_3d is only available for CGAL >= 4.11 +#endif + +#if !EIGEN_VERSION_AT_LEAST(3,1,0) +# error Alpha_complex_3d is only available for Eigen3 >= 3.1.0 installed with CGAL +#endif + namespace Gudhi { namespace witness_complex { diff --git a/src/Witness_complex/include/gudhi/Euclidean_witness_complex.h b/src/Witness_complex/include/gudhi/Euclidean_witness_complex.h index 75ea38e9..21682ec4 100644 --- a/src/Witness_complex/include/gudhi/Euclidean_witness_complex.h +++ b/src/Witness_complex/include/gudhi/Euclidean_witness_complex.h @@ -5,6 +5,7 @@ * Copyright (C) 2015 Inria * * Modification(s): + * - 2019/08 Vincent Rouvreau: Fix issue #10 for CGAL and Eigen3 * - YYYY/MM Author: Description of the modification */ @@ -15,11 +16,24 @@ #include <gudhi/Active_witness/Active_witness.h> #include <gudhi/Kd_tree_search.h> +#include <CGAL/version.h> // for CGAL_VERSION_NR + +#include <Eigen/src/Core/util/Macros.h> // for EIGEN_VERSION_AT_LEAST + #include <utility> #include <vector> #include <list> #include <limits> +// Make compilation fail - required for external projects - https://github.com/GUDHI/gudhi-devel/issues/10 +#if CGAL_VERSION_NR < 1041101000 +# error Alpha_complex_3d is only available for CGAL >= 4.11 +#endif + +#if !EIGEN_VERSION_AT_LEAST(3,1,0) +# error Alpha_complex_3d is only available for Eigen3 >= 3.1.0 installed with CGAL +#endif + namespace Gudhi { namespace witness_complex { |