From 837a74a0d1ec2fe6807b69f19cddaf769316858c Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Fri, 31 May 2019 10:30:39 -0400
Subject: [PATCH] Built entwine

---
 SuperBuild/CMakeLists.txt               |  2 ++
 SuperBuild/cmake/External-Entwine.cmake | 30 +++++++++++++++++++++++++
 SuperBuild/cmake/External-OpenGV.cmake  |  1 -
 SuperBuild/cmake/External-PDAL.cmake    |  5 +++--
 SuperBuild/cmake/External-Zstd.cmake    | 28 +++++++++++++++++++++++
 5 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 SuperBuild/cmake/External-Entwine.cmake
 create mode 100644 SuperBuild/cmake/External-Zstd.cmake

diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt
index f3ac8ebe..e1d2b2ba 100644
--- a/SuperBuild/CMakeLists.txt
+++ b/SuperBuild/CMakeLists.txt
@@ -108,7 +108,9 @@ SETUP_EXTERNAL_PROJECT(Hexer 1.4 ON)
 set(custom_libs OpenGV
 				OpenSfM
 				LASzip
+                Zstd
 				PDAL
+                Entwine
 				MvsTexturing
 )
 
diff --git a/SuperBuild/cmake/External-Entwine.cmake b/SuperBuild/cmake/External-Entwine.cmake
new file mode 100644
index 00000000..c1a27acb
--- /dev/null
+++ b/SuperBuild/cmake/External-Entwine.cmake
@@ -0,0 +1,30 @@
+set(_proj_name entwine)
+set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
+
+ExternalProject_Add(${_proj_name}
+  DEPENDS           pdal
+  PREFIX            ${_SB_BINARY_DIR}
+  TMP_DIR           ${_SB_BINARY_DIR}/tmp
+  STAMP_DIR         ${_SB_BINARY_DIR}/stamp
+  #--Download step--------------
+  DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
+  URL               https://github.com/connormanning/entwine/archive/098c1ee82cf5b08dcd15ce9b6b910a179c85c6fb.zip
+  #--Update/Patch step----------
+  UPDATE_COMMAND    ""
+  #--Configure step-------------
+  SOURCE_DIR        ${SB_SOURCE_DIR}/${_proj_name}
+  CMAKE_ARGS
+    -DCMAKE_CXX_FLAGS=-isystem\ ${SB_SOURCE_DIR}/pdal
+    -DADDITIONAL_LINK_DIRECTORIES_PATHS=${SB_INSTALL_DIR}/lib
+    -DWITH_TESTS=OFF
+	-DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
+  #--Build step-----------------
+  BINARY_DIR        ${_SB_BINARY_DIR}
+  #--Install step---------------
+  INSTALL_DIR       ${SB_INSTALL_DIR}
+  #--Output logging-------------
+  LOG_DOWNLOAD      OFF
+  LOG_CONFIGURE     OFF
+  LOG_BUILD         OFF
+)
diff --git a/SuperBuild/cmake/External-OpenGV.cmake b/SuperBuild/cmake/External-OpenGV.cmake
index 0dd3eeac..70dc52a3 100644
--- a/SuperBuild/cmake/External-OpenGV.cmake
+++ b/SuperBuild/cmake/External-OpenGV.cmake
@@ -1,7 +1,6 @@
 set(_proj_name opengv)
 set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
 
-message("AAA ${_SB_BINARY_DIR}")
 ExternalProject_Add(${_proj_name}
   PREFIX            ${_SB_BINARY_DIR}
   TMP_DIR           ${_SB_BINARY_DIR}/tmp
diff --git a/SuperBuild/cmake/External-PDAL.cmake b/SuperBuild/cmake/External-PDAL.cmake
index a2d6b7cc..2a98144d 100644
--- a/SuperBuild/cmake/External-PDAL.cmake
+++ b/SuperBuild/cmake/External-PDAL.cmake
@@ -2,13 +2,13 @@ set(_proj_name pdal)
 set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
 
 ExternalProject_Add(${_proj_name}
-  DEPENDS           hexer laszip
+  DEPENDS           zstd hexer laszip
   PREFIX            ${_SB_BINARY_DIR}
   TMP_DIR           ${_SB_BINARY_DIR}/tmp
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
-  URL               https://github.com/PDAL/PDAL/archive/1.8.0.zip
+  URL               https://github.com/PDAL/PDAL/archive/1.9.1.zip
   #--Update/Patch step----------
   UPDATE_COMMAND    ""
   #--Configure step-------------
@@ -28,6 +28,7 @@ ExternalProject_Add(${_proj_name}
 	-DBUILD_PLUGIN_SQLITE=OFF
 	-DBUILD_PLUGIN_RIVLIB=OFF
 	-DBUILD_PLUGIN_PYTHON=OFF
+    -DWITH_ZSTD=ON
 	-DENABLE_CTEST=OFF
 	-DWITH_APPS=ON
 	-DWITH_LAZPERF=OFF
diff --git a/SuperBuild/cmake/External-Zstd.cmake b/SuperBuild/cmake/External-Zstd.cmake
new file mode 100644
index 00000000..f7060e43
--- /dev/null
+++ b/SuperBuild/cmake/External-Zstd.cmake
@@ -0,0 +1,28 @@
+set(_proj_name zstd)
+set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
+
+ExternalProject_Add(${_proj_name}
+  PREFIX            ${_SB_BINARY_DIR}
+  TMP_DIR           ${_SB_BINARY_DIR}/tmp
+  STAMP_DIR         ${_SB_BINARY_DIR}/stamp
+  #--Download step--------------
+  DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
+  GIT_REPOSITORY  https://github.com/facebook/zstd
+  GIT_TAG         b84274da0f641907dfe472d5da132d872202e9b8
+  #--Update/Patch step----------
+  UPDATE_COMMAND    ""
+  #--Configure step-------------
+  SOURCE_DIR        ${SB_SOURCE_DIR}/${_proj_name}/build/cmake
+  CMAKE_ARGS
+    -DZSTD_BUILD_PROGRAMS=OFF
+    -DCMAKE_BUILD_TYPE:STRING=Release
+    -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
+  #--Build step-----------------
+  BINARY_DIR        ${_SB_BINARY_DIR}
+  #--Install step---------------
+  INSTALL_DIR       ${SB_INSTALL_DIR}
+  #--Output logging-------------
+  LOG_DOWNLOAD      OFF
+  LOG_CONFIGURE     OFF
+  LOG_BUILD         OFF
+)