From f7dfc9883252782712b9e2794563ef68ece890a8 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Tue, 27 Apr 2021 11:43:51 -0400
Subject: [PATCH] dem2points, dem2mesh install targets

---
 SuperBuild/CMakeLists.txt | 10 ++++------
 configure.sh              |  7 +++++--
 opendm/context.py         | 12 +++++-------
 snap/snapcraft.yaml       |  3 ++-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt
index e8961770..df5e604f 100644
--- a/SuperBuild/CMakeLists.txt
+++ b/SuperBuild/CMakeLists.txt
@@ -134,19 +134,17 @@ externalproject_add(poissonrecon
 externalproject_add(dem2mesh
     GIT_REPOSITORY    https://github.com/OpenDroneMap/dem2mesh.git
     GIT_TAG           master
+    PREFIX            ${SB_BINARY_DIR}/dem2mesh
     SOURCE_DIR        ${SB_SOURCE_DIR}/dem2mesh
-    UPDATE_COMMAND    ""
-    BUILD_IN_SOURCE 1
-    INSTALL_COMMAND   ""
+    CMAKE_ARGS        -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
 )
 
 externalproject_add(dem2points
     GIT_REPOSITORY    https://github.com/OpenDroneMap/dem2points.git
     GIT_TAG           master
+    PREFIX            ${SB_BINARY_DIR}/dem2points
     SOURCE_DIR        ${SB_SOURCE_DIR}/dem2points
-    UPDATE_COMMAND    ""
-    BUILD_IN_SOURCE 1
-    INSTALL_COMMAND   ""
+    CMAKE_ARGS        -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
 )
 
 externalproject_add(lastools
diff --git a/configure.sh b/configure.sh
index 4b3ff049..96cd7dee 100755
--- a/configure.sh
+++ b/configure.sh
@@ -185,10 +185,13 @@ clean() {
         ${RUNPATH}/SuperBuild/src/opengv \
         ${RUNPATH}/SuperBuild/src/pcl \
         ${RUNPATH}/SuperBuild/src/pdal \
+        ${RUNPATH}/SuperBuild/src/dem2mesh \
+        ${RUNPATH}/SuperBuild/build/dem2mesh \
+        ${RUNPATH}/SuperBuild/src/dem2points \
+        ${RUNPATH}/SuperBuild/build/dem2points \
         ${RUNPATH}/SuperBuild/src/openmvs \
         ${RUNPATH}/SuperBuild/build/openmvs \
-        ${RUNPATH}/SuperBuild/src/vcg \
-        ${RUNPATH}/SuperBuild/src/zstd
+        ${RUNPATH}/SuperBuild/src/vcg
 
     # find in /code and delete static libraries and intermediate object files
     find ${RUNPATH} -type f -name "*.a" -delete -or -type f -name "*.o" -delete
diff --git a/opendm/context.py b/opendm/context.py
index f050234e..1ccd6cba 100644
--- a/opendm/context.py
+++ b/opendm/context.py
@@ -8,8 +8,6 @@ root_path, _ = os.path.split(current_path)
 
 superbuild_path = os.path.join(root_path, 'SuperBuild')
 superbuild_bin_path = os.path.join(superbuild_path, 'install', 'bin')
-tests_path = os.path.join(root_path, 'tests')
-tests_data_path = os.path.join(root_path, 'tests/test_data')
 
 # add opencv,opensfm to python path
 python_packages_paths = [os.path.join(superbuild_path, p) for p in [
@@ -28,15 +26,15 @@ opensfm_path = os.path.join(superbuild_path, "src/opensfm")
 orb_slam2_path = os.path.join(superbuild_path, "src/orb_slam2")
 
 poisson_recon_path = os.path.join(superbuild_path, 'src', 'PoissonRecon', 'Bin', 'Linux', 'PoissonRecon')
-dem2mesh_path = os.path.join(superbuild_path, 'src', 'dem2mesh', 'dem2mesh')
-dem2points_path = os.path.join(superbuild_path, 'src', 'dem2points', 'dem2points')
+dem2mesh_path = os.path.join(superbuild_bin_path, 'dem2mesh')
+dem2points_path = os.path.join(superbuild_path, 'dem2points')
 
 # define mvstex path
-mvstex_path = os.path.join(superbuild_path, "install/bin/texrecon")
+mvstex_path = os.path.join(superbuild_bin_path, "texrecon")
 
 # openmvs paths
-omvs_densify_path = os.path.join(superbuild_path, "install/bin/OpenMVS/DensifyPointCloud")
-omvs_reconstructmesh_path = os.path.join(superbuild_path, "install/bin/OpenMVS/ReconstructMesh")
+omvs_densify_path = os.path.join(superbuild_bin_path, "OpenMVS", "DensifyPointCloud")
+omvs_reconstructmesh_path = os.path.join(superbuild_bin_path, "OpenMVS", "ReconstructMesh")
 
 # define txt2las path
 txt2las_path = os.path.join(superbuild_path, 'src/las-tools/bin')
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 37359d88..61d0883a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -213,7 +213,8 @@ parts:
       - -odm/SuperBuild/src/pcl
       - -odm/SuperBuild/src/pdal
       - -odm/SuperBuild/src/vcg
-      - -odm/SuperBuild/src/zstd
+      - -odm/SuperBuild/src/dem2mesh
+      - -odm/SuperBuild/src/dem2points
     prime:
       # remove any static-libraries
       - -**/*.a