songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make compilation more explicit when Eigen < 3.2 is used

This commit is contained in:
Jane Tournois 2015-08-17 12:08:50 +02:00
parent fb1714154f
commit aef04b7dce
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h
View File

@ -29,6 +29,7 @@
#include <CGAL/Eigen_solver_traits.h> // for sparse linear system solver #include <CGAL/Eigen_solver_traits.h> // for sparse linear system solver
#endif #endif
#include <boost/type_traits/is_same.hpp>
namespace CGAL { namespace CGAL {
@ -122,6 +123,12 @@ namespace internal {
//if no solver is provided and Eigen version < 3.2 //if no solver is provided and Eigen version < 3.2
#endif #endif
typedef typename GetSolver<NamedParameters, Default_solver>::type SparseLinearSolver;
if (boost::is_same<SparseLinearSolver, bool>::value)
{
BOOST_STATIC_ASSERT_MSG(EIGEN_VERSION_AT_LEAST(3, 2, 0),
"The function `fair` requires Eigen3 version 3.2 or later.");
}
typedef typename GetVertexPointMap < PolygonMesh, NamedParameters>::type VPMap; typedef typename GetVertexPointMap < PolygonMesh, NamedParameters>::type VPMap;
typedef CGAL::internal::Cotangent_weight_with_voronoi_area_fairing<PolygonMesh, VPMap> typedef CGAL::internal::Cotangent_weight_with_voronoi_area_fairing<PolygonMesh, VPMap>
Default_Weight_calculator; Default_Weight_calculator;

11
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_params_helper.h
View File

@ -100,6 +100,17 @@ public:
> ::type type; > ::type type;
}; };
template<typename NamedParameters, typename DefaultSolver>
class GetSolver
{
public:
typedef typename boost::lookup_named_param_def <
CGAL::sparse_linear_solver_t,
NamedParameters,
DefaultSolver
> ::type type;
};
#endif //CGAL_NAMED_PARAMETERS_HELPERS_H #endif //CGAL_NAMED_PARAMETERS_HELPERS_H