From 0e803b92332aa3a4a6df2455bd5c6014143dc8dc Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Mon, 2 Nov 2020 21:26:48 +0000
Subject: [PATCH] Add openmvs deps in snapcraft

---
 configure.sh        |  6 ++++++
 snap/snapcraft.yaml | 12 ++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/configure.sh b/configure.sh
index 025e8412..deafae19 100644
--- a/configure.sh
+++ b/configure.sh
@@ -87,6 +87,9 @@ installruntimedepsonly() {
     installdepsfromsnapcraft runtime opencv
     echo "Installing OpenSfM Dependencies"
     installdepsfromsnapcraft runtime opensfm
+    echo "Installing OpenMVS Dependencies"
+    installdepsfromsnapcraft runtime openmvs
+    
 }
     
 install() {
@@ -106,6 +109,9 @@ install() {
     installdepsfromsnapcraft build opencv
     echo "Installing OpenSfM Dependencies"
     installdepsfromsnapcraft build opensfm
+    echo "Installing OpenMVS Dependencies"
+    installdepsfromsnapcraft build openmvs
+    
 
     pip install --ignore-installed -r requirements.txt
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 6b9b9096..f28f5b4a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -43,7 +43,6 @@ parts:
       - libboost-log-dev
       - libgdal-dev
       - libgeotiff-dev
-      - libcgal-dev
       - libjsoncpp-dev
       - libssl-dev
       - libusb-dev
@@ -106,6 +105,14 @@ parts:
       - libtiff5
       - libvtk6.3
       - libxext6
+  
+  openmvs:
+    source: .
+    plugin: nil
+    override-pull: exit 0
+    build-packages:
+      - libcgal-dev
+      - libboost-program-options-dev
 
   opensfm:
     source: .
@@ -142,6 +149,7 @@ parts:
       - prereqs
       - opencv
       - opensfm
+      - openmvs
     source: .
     plugin: nil # We will script everything ourselves
     build-environment:
@@ -184,7 +192,7 @@ parts:
       - -odm/SuperBuild/src/laszip
       - -odm/SuperBuild/src/mvstexturing
       - -odm/SuperBuild/src/opencv
-      - -odm/SuperBuild/src/opengv
+      - -odm/SuperBuild/src/openmvs
       - -odm/SuperBuild/src/pcl
       - -odm/SuperBuild/src/pdal
       - -odm/SuperBuild/src/zstd