From 567e69a2c7ea49898a2e1904d943130675728fc6 Mon Sep 17 00:00:00 2001 From: PhilipDeegan Date: Sun, 15 Sep 2024 21:08:03 +0200 Subject: [PATCH] ++ --- mkn.base.yaml | 9 +++++++-- mkn.sh | 10 +++++++--- mkn.yaml | 6 +++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/mkn.base.yaml b/mkn.base.yaml index f993c00..66e7896 100644 --- a/mkn.base.yaml +++ b/mkn.base.yaml @@ -1,4 +1,9 @@ name: libpcl.base -dep: org.boost math.eigen -sub: pcl&p(https://github.com/PointCloudLibrary/pcl) + +property: + pcl.deps: org.boost math.eigen math.flann + pcl.subs: pcl&p(https://github.com/PointCloudLibrary/pcl) + +dep: ${pcl.deps} +sub: ${pcl.subs} diff --git a/mkn.sh b/mkn.sh index a6ed31f..9d00452 100755 --- a/mkn.sh +++ b/mkn.sh @@ -6,11 +6,15 @@ CWD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $CWD mkn -C mkn.base.yaml MKN_REPO=$(mkn -G MKN_REPO -C mkn.base.yaml) - rm -rf build && mkdir build && cd build - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + rm -rf build && mkdir build + ( + cd build + cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ -DEigen3_DIR="${MKN_REPO}/math/eigen/master/share/eigen3/cmake" \ -DBoost_DIR="${MKN_REPO}/org/boost/master/lib/cmake/Boost-1.86.0" \ -DFLANN_ROOT="${MKN_REPO}/math/flann/master" \ -DCMAKE_INSTALL_PREFIX=$CWD ../p - ninja && ninja install + ninja && ninja install + ) + rm -rf build ) diff --git a/mkn.yaml b/mkn.yaml index 0fe7a85..4d1ab97 100644 --- a/mkn.yaml +++ b/mkn.yaml @@ -1,10 +1,10 @@ name: libpcl parent: base - +super: mkn.base.yaml profile: - name: base inc: include path: lib - dep: org.boost math.eigen - sub: pcl&p(https://github.com/PointCloudLibrary/pcl) + dep: ${pcl.deps} + sub: ${pcl.subs}