Updated OpenSfM

Former-commit-id: c9ed5ebea8

SuperBuild/cmake/External-Ceres.cmake

@@ -8,8 +8,7 @@ ExternalProject_Add(${_proj_name}
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
-  URL               http://ceres-solver.org/ceres-solver-1.10.0.tar.gz
-  URL_MD5           dbf9f452bd46e052925b835efea9ab16
+  URL               http://ceres-solver.org/ceres-solver-1.14.0.tar.gz
   #--Update/Patch step----------
   UPDATE_COMMAND    ""
   #--Configure step-------------

SuperBuild/cmake/External-GFlags.cmake

@@ -7,8 +7,8 @@ ExternalProject_Add(${_proj_name}
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
-  URL               https://github.com/gflags/gflags/archive/v2.1.2.zip
-  URL_MD5           5cb0a1b38740ed596edb7f86cd5b3bd8
+  GIT_REPOSITORY  https://github.com/gflags/gflags
+  GIT_TAG         28f50e0fed19872e0fd50dd23ce2ee8cd759338e
   #--Update/Patch step----------
   UPDATE_COMMAND    ""
   #--Configure step-------------

SuperBuild/cmake/External-OpenGV.cmake

@@ -1,21 +1,23 @@
 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
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
-  URL               https://github.com/paulinus/opengv/archive/7436794df04d85433a966395088e38b107e69fc2.zip
-  URL_MD5           9B303C3AB9F210B242941E851572D2C8
+  GIT_REPOSITORY    https://github.com/paulinus/opengv/
+  GIT_TAG           306a54e6c6b94e2048f820cdf77ef5281d4b48ad
   #--Update/Patch step----------
-  UPDATE_COMMAND    ""
+  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=2.7
     -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
   #--Build step-----------------
   BINARY_DIR        ${_SB_BINARY_DIR}

SuperBuild/cmake/External-OpenSfM.cmake

@@ -2,22 +2,23 @@ set(_proj_name opensfm)
 set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
 
 ExternalProject_Add(${_proj_name}
-  DEPENDS           ceres opencv opengv
+  DEPENDS           ceres opencv opengv gflags
   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/OpenDroneMap/OpenSfM/archive/9b4b17f238a3762c4267cdaeb5f64173c0f704a6.zip
+  GIT_REPOSITORY    https://github.com/mapillary/OpenSfM/
+  GIT_TAG           00655397be3e27c490492ae01197bf66c51fa493
   #--Update/Patch step----------
-  UPDATE_COMMAND    ""
+  UPDATE_COMMAND    git submodule update --init --recursive
   #--Configure step-------------
   SOURCE_DIR        ${SB_SOURCE_DIR}/${_proj_name}
   CONFIGURE_COMMAND cmake <SOURCE_DIR>/${_proj_name}/src
     -DCERES_ROOT_DIR=${SB_INSTALL_DIR}
     -DOpenCV_DIR=${SB_INSTALL_DIR}/share/OpenCV
     -DOPENSFM_BUILD_TESTS=off
-
+    -DPYTHON_EXECUTABLE=/usr/bin/python
   #--Build step-----------------
   BINARY_DIR        ${_SB_BINARY_DIR}
   #--Install step---------------

VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1