From a92d9338988008bdf7aeecbf9700ce86f6630c80 Mon Sep 17 00:00:00 2001 From: Dakota Benjamin Date: Wed, 16 Mar 2016 12:55:04 -0400 Subject: [PATCH] Remove LASTools Former-commit-id: 9cb6073846be3321bd17ebddf79aa7af379490e0 --- SuperBuild/CMakeLists.txt | 2 -- SuperBuild/cmake/External-LAStools.cmake | 26 ------------------------ tests/test_odm.py | 4 ++++ 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 SuperBuild/cmake/External-LAStools.cmake diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index 97636956..b704578c 100644 --- a/SuperBuild/CMakeLists.txt +++ b/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}) diff --git a/SuperBuild/cmake/External-LAStools.cmake b/SuperBuild/cmake/External-LAStools.cmake deleted file mode 100644 index d25fdb72..00000000 --- a/SuperBuild/cmake/External-LAStools.cmake +++ /dev/null @@ -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 -) diff --git a/tests/test_odm.py b/tests/test_odm.py index dc2f424a..648a657b 100644 --- a/tests/test_odm.py +++ b/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):