Merge pull request #277 from dakotabenjamin/remove-lastools

Remove LASTools

Former-commit-id: de0e27ccd5

SuperBuild/CMakeLists.txt

@@ -94,7 +94,6 @@ SETUP_EXTERNAL_PROJECT(Ceres ${ODM_Ceres_Version} ${ODM_BUILD_Ceres})
 # Clustering Views for Multi-view Stereo (CMVS)
 # Catkin
 # Ecto
-# LAStools
 #
 
 set(custom_libs OpenGV
@@ -102,7 +101,6 @@ set(custom_libs OpenGV
 				CMVS
 				Catkin
 				Ecto
-				LAStools
 				PDAL)
 
 foreach(lib ${custom_libs})

SuperBuild/cmake/External-LAStools.cmake

@@ -1,26 +0,0 @@
-set(_proj_name las-tools)
-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}
-  URL               http://lastools.org/download/LAStools.zip
-  #--Update/Patch step----------
-  UPDATE_COMMAND    ""
-  #--Configure step-------------
-  SOURCE_DIR        ${SB_SOURCE_DIR}/${_proj_name}
-  CONFIGURE_COMMAND ""
-  WORKING_DIRECTORY "${SB_SOURCE_DIR}/${_proj_name}"
-  #--Build step-----------------
-  BUILD_IN_SOURCE 1
-  #--Install step---------------
-  INSTALL_DIR       ${SB_INSTALL_DIR}
-  INSTALL_COMMAND ""
-  #--Output logging-------------
-  LOG_DOWNLOAD      OFF
-  LOG_CONFIGURE     OFF
-  LOG_BUILD         OFF
-)

tests/test_odm.py

@@ -134,6 +134,10 @@ class TestGeoreferencing(unittest.TestCase):
         self.assertTrue(os.path.isfile(self.app.georeferencing.inputs.tree.odm_georeferencing_coords) &
                         os.path.isfile(self.app.georeferencing.inputs.tree.odm_georeferencing_model_obj_geo))
 
+    def test_las_out(self):
+        self.assertTrue(os.path.isfile(os.path.join(self.app.georeferencing.inputs.tree.odm_georeferencing,
+                                                    "odm_georeferenced_model.ply.las")))
+
 
 class TestOrthophoto(unittest.TestCase):