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/Alpha_complex/include | |
parent | ed59f5bf1b35269cf4324dbb72df863bf50dac01 (diff) |
Fix issue #10 and modify main and installation documentations accordingly
Diffstat (limited to 'src/Alpha_complex/include')
-rw-r--r-- | src/Alpha_complex/include/gudhi/Alpha_complex.h | 13 | ||||
-rw-r--r-- | src/Alpha_complex/include/gudhi/Alpha_complex_3d.h | 11 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/Alpha_complex/include/gudhi/Alpha_complex.h b/src/Alpha_complex/include/gudhi/Alpha_complex.h index cdc1ed1d..8919cdb9 100644 --- a/src/Alpha_complex/include/gudhi/Alpha_complex.h +++ b/src/Alpha_complex/include/gudhi/Alpha_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 */ @@ -23,6 +24,9 @@ #include <CGAL/Spatial_sort_traits_adapter_d.h> #include <CGAL/property_map.h> // for CGAL::Identity_property_map #include <CGAL/NT_converter.h> +#include <CGAL/version.h> // for CGAL_VERSION_NR + +#include <Eigen/src/Core/util/Macros.h> // for EIGEN_VERSION_AT_LEAST #include <iostream> #include <vector> @@ -33,6 +37,15 @@ #include <stdexcept> #include <numeric> // for std::iota +// 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 alpha_complex { diff --git a/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h b/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h index 9bff42b5..13ebb9c1 100644 --- a/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h +++ b/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h @@ -5,6 +5,7 @@ * Copyright (C) 2018 Inria * * Modification(s): + * - 2019/08 Vincent Rouvreau: Fix issue #10 for CGAL and Eigen3 * - YYYY/MM Author: Description of the modification */ @@ -32,7 +33,9 @@ #include <CGAL/Object.h> #include <CGAL/tuple.h> #include <CGAL/iterator.h> -#include <CGAL/version.h> +#include <CGAL/version.h> // for CGAL_VERSION_NR + +#include <Eigen/src/Core/util/Macros.h> // for EIGEN_VERSION_AT_LEAST #include <boost/container/static_vector.hpp> @@ -45,11 +48,15 @@ #include <type_traits> // for std::conditional and std::enable_if #include <limits> // for numeric_limits<> -#if CGAL_VERSION_NR < 1041101000 // 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 alpha_complex { |