From 8040c1763ffe51c8cbb8e1bd7ef2548f0b690cae Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Mon, 26 Apr 2021 14:59:04 -0400
Subject: [PATCH] Remove zstd, do not require OpenGL for PCL

---
 SuperBuild/CMakeLists.txt            |  7 ++--
 SuperBuild/cmake/External-PCL.cmake  |  1 +
 SuperBuild/cmake/External-PDAL.cmake | 48 ++++++++++++++--------------
 SuperBuild/cmake/External-Zstd.cmake | 26 ---------------
 4 files changed, 28 insertions(+), 54 deletions(-)
 delete mode 100644 SuperBuild/cmake/External-Zstd.cmake

diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt
index 0a5b9ab9..e8961770 100644
--- a/SuperBuild/CMakeLists.txt
+++ b/SuperBuild/CMakeLists.txt
@@ -106,12 +106,11 @@ SETUP_EXTERNAL_PROJECT(Hexer 1.4 ON)
 
 set(custom_libs OpenSfM
 				LASzip
-                Zstd
 				PDAL
-                Untwine
-                Entwine
+				Untwine
+				Entwine
 				MvsTexturing
-                OpenMVS
+				OpenMVS
 )
 
 foreach(lib ${custom_libs})
diff --git a/SuperBuild/cmake/External-PCL.cmake b/SuperBuild/cmake/External-PCL.cmake
index 93895ade..914fc680 100644
--- a/SuperBuild/cmake/External-PCL.cmake
+++ b/SuperBuild/cmake/External-PCL.cmake
@@ -28,6 +28,7 @@ ExternalProject_Add(${_proj_name}
     -DBUILD_tools=OFF
     -DBUILD_tracking=OFF
     -DBUILD_visualization=OFF
+    -DWITH_OPENGL=OFF
     -DWITH_VTK=OFF
     -DWITH_QT=OFF
     -DBUILD_OPENNI=OFF
diff --git a/SuperBuild/cmake/External-PDAL.cmake b/SuperBuild/cmake/External-PDAL.cmake
index 879826c0..3f8bf88a 100644
--- a/SuperBuild/cmake/External-PDAL.cmake
+++ b/SuperBuild/cmake/External-PDAL.cmake
@@ -2,7 +2,7 @@ set(_proj_name pdal)
 set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
 
 ExternalProject_Add(${_proj_name}
-  DEPENDS           zstd hexer laszip
+  DEPENDS           hexer laszip
   PREFIX            ${_SB_BINARY_DIR}
   TMP_DIR           ${_SB_BINARY_DIR}/tmp
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
@@ -17,29 +17,29 @@ ExternalProject_Add(${_proj_name}
     -DBUILD_PGPOINTCLOUD_TESTS=OFF
     -DBUILD_PLUGIN_PGPOINTCLOUD=OFF
     -DBUILD_PLUGIN_CPD=OFF
-	-DBUILD_PLUGIN_GREYHOUND=OFF
-	-DBUILD_PLUGIN_HEXBIN=ON
-	-DBUILD_PLUGIN_ICEBRIDGE=OFF
-	-DBUILD_PLUGIN_MRSID=OFF
-	-DBUILD_PLUGIN_NITF=OFF
-	-DBUILD_PLUGIN_OCI=OFF
-	-DBUILD_PLUGIN_P2G=OFF
-	-DBUILD_PLUGIN_SQLITE=OFF
-	-DBUILD_PLUGIN_RIVLIB=OFF
-	-DBUILD_PLUGIN_PYTHON=OFF
-    -DWITH_ZSTD=ON
-	-DENABLE_CTEST=OFF
-	-DWITH_APPS=ON
-	-DWITH_LAZPERF=OFF
-	-DWITH_GEOTIFF=ON
-	-DWITH_LASZIP=ON
-	-DLASZIP_FOUND=TRUE
-	-DLASZIP_LIBRARIES=${SB_INSTALL_DIR}/lib/liblaszip.so
-	-DLASZIP_VERSION=3.1.1
-	-DLASZIP_INCLUDE_DIR=${SB_INSTALL_DIR}/include
-	-DLASZIP_LIBRARY=${SB_INSTALL_DIR}/lib/liblaszip.so
-	-DWITH_TESTS=OFF
-	-DCMAKE_BUILD_TYPE=Release
+    -DBUILD_PLUGIN_GREYHOUND=OFF
+    -DBUILD_PLUGIN_HEXBIN=ON
+    -DBUILD_PLUGIN_ICEBRIDGE=OFF
+    -DBUILD_PLUGIN_MRSID=OFF
+    -DBUILD_PLUGIN_NITF=OFF
+    -DBUILD_PLUGIN_OCI=OFF
+    -DBUILD_PLUGIN_P2G=OFF
+    -DBUILD_PLUGIN_SQLITE=OFF
+    -DBUILD_PLUGIN_RIVLIB=OFF
+    -DBUILD_PLUGIN_PYTHON=OFF
+    -DWITH_ZSTD=OFF
+    -DENABLE_CTEST=OFF
+    -DWITH_APPS=ON
+    -DWITH_LAZPERF=OFF
+    -DWITH_GEOTIFF=ON
+    -DWITH_LASZIP=ON
+    -DLASZIP_FOUND=TRUE
+    -DLASZIP_LIBRARIES=${SB_INSTALL_DIR}/lib/liblaszip.so
+    -DLASZIP_VERSION=3.1.1
+    -DLASZIP_INCLUDE_DIR=${SB_INSTALL_DIR}/include
+    -DLASZIP_LIBRARY=${SB_INSTALL_DIR}/lib/liblaszip.so
+    -DWITH_TESTS=OFF
+    -DCMAKE_BUILD_TYPE=Release
     -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
   #--Build step-----------------
   BINARY_DIR        ${_SB_BINARY_DIR}
diff --git a/SuperBuild/cmake/External-Zstd.cmake b/SuperBuild/cmake/External-Zstd.cmake
deleted file mode 100644
index 5fc23bef..00000000
--- a/SuperBuild/cmake/External-Zstd.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-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}
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DZSTD_BUILD_PROGRAMS=OFF -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
-        <SOURCE_DIR>/build/cmake
-  #--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
-)