From 4529d09e5815cb48f24c446e2b1528f49e69aaa5 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni Date: Thu, 26 Jan 2017 15:31:53 +0100 Subject: [PATCH] Removed hard coded eigenlib path from the include. So you are free to use the version of eigen you prefer. Note that since this commit in your projects you must add also the eigen folder to the include path. --- apps/sample/common.pri | 2 +- vcg/complex/algorithms/curve_on_manifold.h | 2 +- vcg/complex/algorithms/harmonic.h | 2 +- vcg/complex/algorithms/implicit_smooth.h | 2 +- vcg/complex/algorithms/inertia.h | 4 ++-- .../algorithms/parametrization/poisson_solver.h | 2 +- vcg/complex/algorithms/update/curvature.h | 2 +- vcg/complex/algorithms/update/curvature_fitting.h | 10 +++++----- vcg/complex/algorithms/update/fitmaps.h | 8 ++++---- vcg/math/matrix44.h | 4 ++-- vcg/math/polar_decomposition.h | 4 ++-- vcg/math/quadric.h | 2 +- vcg/space/fitting3.h | 4 ++-- vcg/space/point_matching.h | 4 ++-- wrap/igl/smooth_field.h | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/apps/sample/common.pri b/apps/sample/common.pri index e908b112..218c2fe8 100644 --- a/apps/sample/common.pri +++ b/apps/sample/common.pri @@ -1,5 +1,5 @@ DEPENDPATH += . ../../.. -INCLUDEPATH += . ../../.. +INCLUDEPATH += . ../../.. ../../../eigenlib CONFIG += console c++11 TEMPLATE = app # Mac specific Config required to avoid to make application bundles diff --git a/vcg/complex/algorithms/curve_on_manifold.h b/vcg/complex/algorithms/curve_on_manifold.h index 5b9d8584..66016ae3 100644 --- a/vcg/complex/algorithms/curve_on_manifold.h +++ b/vcg/complex/algorithms/curve_on_manifold.h @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcg/complex/algorithms/harmonic.h b/vcg/complex/algorithms/harmonic.h index d004d7bf..f2e6dd99 100644 --- a/vcg/complex/algorithms/harmonic.h +++ b/vcg/complex/algorithms/harmonic.h @@ -24,7 +24,7 @@ #define __VCGLIB_HARMONIC_FIELD #include -#include +#include namespace vcg { namespace tri { diff --git a/vcg/complex/algorithms/implicit_smooth.h b/vcg/complex/algorithms/implicit_smooth.h index 2e1e24f4..1d0e3f47 100644 --- a/vcg/complex/algorithms/implicit_smooth.h +++ b/vcg/complex/algorithms/implicit_smooth.h @@ -23,7 +23,7 @@ #ifndef __VCG_IMPLICIT_SMOOTHER #define __VCG_IMPLICIT_SMOOTHER -#include +#include #include #include #include diff --git a/vcg/complex/algorithms/inertia.h b/vcg/complex/algorithms/inertia.h index c365b5ac..d3449fc3 100644 --- a/vcg/complex/algorithms/inertia.h +++ b/vcg/complex/algorithms/inertia.h @@ -24,8 +24,8 @@ #define _VCG_INERTIA_ -#include -#include +#include +#include #include namespace vcg diff --git a/vcg/complex/algorithms/parametrization/poisson_solver.h b/vcg/complex/algorithms/parametrization/poisson_solver.h index 7497010f..7549d3ef 100644 --- a/vcg/complex/algorithms/parametrization/poisson_solver.h +++ b/vcg/complex/algorithms/parametrization/poisson_solver.h @@ -24,7 +24,7 @@ #ifndef VCG_POISSON_SOLVER #define VCG_POISSON_SOLVER -#include +#include #include #include diff --git a/vcg/complex/algorithms/update/curvature.h b/vcg/complex/algorithms/update/curvature.h index 441121b3..9afd2fd0 100644 --- a/vcg/complex/algorithms/update/curvature.h +++ b/vcg/complex/algorithms/update/curvature.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include namespace vcg { namespace tri { diff --git a/vcg/complex/algorithms/update/curvature_fitting.h b/vcg/complex/algorithms/update/curvature_fitting.h index b2b8c633..27e96182 100644 --- a/vcg/complex/algorithms/update/curvature_fitting.h +++ b/vcg/complex/algorithms/update/curvature_fitting.h @@ -38,11 +38,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace vcg { diff --git a/vcg/complex/algorithms/update/fitmaps.h b/vcg/complex/algorithms/update/fitmaps.h index bd2c94f0..3105db66 100644 --- a/vcg/complex/algorithms/update/fitmaps.h +++ b/vcg/complex/algorithms/update/fitmaps.h @@ -34,10 +34,10 @@ #include #include "vcg/complex/algorithms/update/curvature_fitting.h" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/vcg/math/matrix44.h b/vcg/math/matrix44.h index a138e57d..2ea806d6 100644 --- a/vcg/math/matrix44.h +++ b/vcg/math/matrix44.h @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include namespace vcg { diff --git a/vcg/math/polar_decomposition.h b/vcg/math/polar_decomposition.h index deabf861..7d4f03e1 100644 --- a/vcg/math/polar_decomposition.h +++ b/vcg/math/polar_decomposition.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include namespace vcg{ diff --git a/vcg/math/quadric.h b/vcg/math/quadric.h index 85220562..a4cfb4f4 100644 --- a/vcg/math/quadric.h +++ b/vcg/math/quadric.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include namespace vcg { namespace math { diff --git a/vcg/space/fitting3.h b/vcg/space/fitting3.h index e9e238aa..69b8fe19 100644 --- a/vcg/space/fitting3.h +++ b/vcg/space/fitting3.h @@ -29,8 +29,8 @@ #include #include -#include -#include +#include +#include namespace vcg { diff --git a/vcg/space/point_matching.h b/vcg/space/point_matching.h index e9ac0ff8..05c599b6 100644 --- a/vcg/space/point_matching.h +++ b/vcg/space/point_matching.h @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include namespace vcg diff --git a/wrap/igl/smooth_field.h b/wrap/igl/smooth_field.h index e1208cfb..c126a038 100644 --- a/wrap/igl/smooth_field.h +++ b/wrap/igl/smooth_field.h @@ -25,7 +25,7 @@ #define SMOOTHER_FIELD_H //eigen stuff -#include +#include //vcg stuff #include