From 6f189f10142eae2eb24dcfdf035015fc51950b20 Mon Sep 17 00:00:00 2001 From: Mark Ian Holland Date: Tue, 29 Jan 2019 19:09:38 +0000 Subject: [PATCH] [vcglib] inital port (#4626) --- ports/vcglib/CONTROL | 4 + ports/vcglib/consume-vcpkg-eigen3.patch | 225 ++++++++++++++++++++++++ ports/vcglib/portfile.cmake | 15 ++ 3 files changed, 244 insertions(+) create mode 100644 ports/vcglib/CONTROL create mode 100644 ports/vcglib/consume-vcpkg-eigen3.patch create mode 100644 ports/vcglib/portfile.cmake diff --git a/ports/vcglib/CONTROL b/ports/vcglib/CONTROL new file mode 100644 index 0000000000..7f52548f4d --- /dev/null +++ b/ports/vcglib/CONTROL @@ -0,0 +1,4 @@ +Source: vcglib +Version: 1.0.1 +Description: library for manipulation, processing, cleaning, simplifying triangle meshes. +Build-Depends: eigen3 \ No newline at end of file diff --git a/ports/vcglib/consume-vcpkg-eigen3.patch b/ports/vcglib/consume-vcpkg-eigen3.patch new file mode 100644 index 0000000000..35e9f5537b --- /dev/null +++ b/ports/vcglib/consume-vcpkg-eigen3.patch @@ -0,0 +1,225 @@ +diff --git a/vcg/complex/algorithms/curve_on_manifold.h b/vcg/complex/algorithms/curve_on_manifold.h +index 5b9d858..f091b4b 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 d004d7b..13d5167 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 2e1e24f..76311e2 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 41b5a29..f25d6f9 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 cf5c36d..3b8f1a5 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 441121b..0a96146 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 b2b8c63..ab04b6b 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 bd2c94f..fd837d7 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/eigen.h b/vcg/math/eigen.h +index 5cae402..81f32ff 100644 +--- a/vcg/math/eigen.h ++++ b/vcg/math/eigen.h +@@ -53,10 +53,10 @@ struct ei_to_vcgtype; + } + + #include "base.h" +-#include "../../eigenlib/Eigen/LU" +-#include "../../eigenlib/Eigen/Geometry" +-#include "../../eigenlib/Eigen/Array" +-#include "../../eigenlib/Eigen/Core" ++#include "../../eigen3/Eigen/LU" ++#include "../../eigen3/Eigen/Geometry" ++#include "../../eigen3/Eigen/Array" ++#include "../../eigen3/Eigen/Core" + + // add support for unsigned char and short int + namespace Eigen { +diff --git a/vcg/math/matrix44.h b/vcg/math/matrix44.h +index a138e57..5291e0e 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 deabf86..bd725d1 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 8522056..99a9de1 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 e9e238a..6861969 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 e9ac0ff..c6ff376 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 e1208cf..a403d54 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 diff --git a/ports/vcglib/portfile.cmake b/ports/vcglib/portfile.cmake new file mode 100644 index 0000000000..5389a69fb0 --- /dev/null +++ b/ports/vcglib/portfile.cmake @@ -0,0 +1,15 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cnr-isti-vclab/vcglib + REF v1.0.1 + SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211 + PATCHES consume-vcpkg-eigen3.patch + ) + +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vcglib/copyright COPYONLY) + +file(COPY ${SOURCE_PATH}/vcg/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/vcg) +file(COPY ${SOURCE_PATH}/wrap/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/wrap) +file(COPY ${SOURCE_PATH}/img/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/img)