Bump version, up OpenSfM branch, cleanup

SuperBuild/CMakeLists.txt

@@ -101,12 +101,10 @@ SETUP_EXTERNAL_PROJECT(Ceres ${ODM_Ceres_Version} ${ODM_BUILD_Ceres})
 SETUP_EXTERNAL_PROJECT(Hexer 1.4 ON)
 
 # ---------------------------------------------------------------------------------------------
-# Open Geometric Vision (OpenGV)
 # Open Structure from Motion (OpenSfM)
 #
 
-set(custom_libs OpenGV
-				OpenSfM
+set(custom_libs OpenSfM
 				LASzip
                 Zstd
 				PDAL
@@ -114,13 +112,6 @@ set(custom_libs OpenGV
 				MvsTexturing
 )
 
-# Dependencies of the SLAM module
-if(ODM_BUILD_SLAM)
-	list(APPEND custom_libs
-				Pangolin
-				ORB_SLAM2)
-endif()
-
 foreach(lib ${custom_libs})
 	SETUP_EXTERNAL_PROJECT_CUSTOM(${lib})
 endforeach()

SuperBuild/cmake/External-OpenGV.cmake

@@ -1,30 +0,0 @@
-set(_proj_name opengv)
-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/paulinus/opengv/
-  GIT_TAG           306a54e6c6b94e2048f820cdf77ef5281d4b48ad
-  #--Update/Patch step----------
-  UPDATE_COMMAND    git submodule update --init --recursive
-  #--Configure step-------------
-  SOURCE_DIR        ${SB_SOURCE_DIR}/${_proj_name}
-  CMAKE_ARGS
-    -DBUILD_TESTS=OFF 
-    -DBUILD_PYTHON=ON
-    -DPYBIND11_PYTHON_VERSION=3.6
-    -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
-)
-

SuperBuild/cmake/External-OpenSfM.cmake

@@ -2,14 +2,14 @@ set(_proj_name opensfm)
 set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
 
 ExternalProject_Add(${_proj_name}
-  DEPENDS           ceres opencv opengv gflags
+  DEPENDS           ceres opencv gflags
   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/OpenDroneMap/OpenSfM/
-  GIT_TAG           200
+  GIT_TAG           210
   #--Update/Patch step----------
   UPDATE_COMMAND    git submodule update --init --recursive
   #--Configure step-------------

VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0