Dakota Benjamin
|
7b41a963d1
|
Merge branch 'cmake' of https://github.com/edgarriba/OpenDroneMap into edgarriba-cmake
Conflicts:
install.sh
Changes to be committed:
modified: .gitignore
new file: CMakeLists.txt
deleted: PoissonRecon.zip
new file: SuperBuild/CMakeLists.txt
new file: SuperBuild/cmake/External-CMVS.cmake
new file: SuperBuild/cmake/External-Catkin.cmake
new file: SuperBuild/cmake/External-Ceres.cmake
new file: SuperBuild/cmake/External-Ecto.cmake
new file: SuperBuild/cmake/External-GFlags.cmake
new file: SuperBuild/cmake/External-LAStools.cmake
new file: SuperBuild/cmake/External-OpenCV.cmake
new file: SuperBuild/cmake/External-OpenGV.cmake
new file: SuperBuild/cmake/External-OpenSfM.cmake
new file: SuperBuild/cmake/External-PCL.cmake
new file: SuperBuild/cmake/ExternalProject-Setup.cmake
modified: ccd_defs_check.py
deleted: clapack.tgz
deleted: cmvs.tar.gz.part-aa
deleted: cmvs.tar.gz.part-ab
deleted: cmvs.tar.gz.part-ac
deleted: cmvs.tar.gz.part-ad
deleted: cmvs.tar.gz.part-ae
new file: configure.sh
deleted: convert_vlsift_to_lowesift.pl
renamed: ccd_defs.json -> data/ccd_defs.json
deleted: graclus.tar.gz
modified: hooks/pre-commit
deleted: install.sh
deleted: knnMatch_exif.py
new file: modules/CMakeLists.txt
renamed: odm_extract_utm/CMakeLists.txt -> modules/odm_extract_utm/CMakeLists.txt
renamed: odm_extract_utm/src/Logger.cpp -> modules/odm_extract_utm/src/Logger.cpp
renamed: odm_extract_utm/src/Logger.hpp -> modules/odm_extract_utm/src/Logger.hpp
renamed: odm_extract_utm/src/UtmExtractor.cpp -> modules/odm_extract_utm/src/UtmExtractor.cpp
renamed: odm_extract_utm/src/UtmExtractor.hpp -> modules/odm_extract_utm/src/UtmExtractor.hpp
renamed: odm_extract_utm/src/main.cpp -> modules/odm_extract_utm/src/main.cpp
renamed: odm_georef/CMakeLists.txt -> modules/odm_georef/CMakeLists.txt
renamed: odm_georef/CMakeLists.txt.user -> modules/odm_georef/CMakeLists.txt.user
renamed: odm_georef/src/FindTransform.cpp -> modules/odm_georef/src/FindTransform.cpp
renamed: odm_georef/src/FindTransform.hpp -> modules/odm_georef/src/FindTransform.hpp
renamed: odm_georef/src/Georef.cpp -> modules/odm_georef/src/Georef.cpp
renamed: odm_georef/src/Georef.hpp -> modules/odm_georef/src/Georef.hpp
renamed: odm_georef/src/Logger.cpp -> modules/odm_georef/src/Logger.cpp
renamed: odm_georef/src/Logger.hpp -> modules/odm_georef/src/Logger.hpp
renamed: odm_georef/src/main.cpp -> modules/odm_georef/src/main.cpp
renamed: odm_georef/src/modifiedPclFunctions.cpp -> modules/odm_georef/src/modifiedPclFunctions.cpp
renamed: odm_georef/src/modifiedPclFunctions.hpp -> modules/odm_georef/src/modifiedPclFunctions.hpp
renamed: odm_meshing/CMakeLists.txt -> modules/odm_meshing/CMakeLists.txt
renamed: odm_meshing/src/Logger.cpp -> modules/odm_meshing/src/Logger.cpp
renamed: odm_meshing/src/Logger.hpp -> modules/odm_meshing/src/Logger.hpp
renamed: odm_meshing/src/OdmMeshing.cpp -> modules/odm_meshing/src/OdmMeshing.cpp
renamed: odm_meshing/src/OdmMeshing.hpp -> modules/odm_meshing/src/OdmMeshing.hpp
renamed: odm_meshing/src/main.cpp -> modules/odm_meshing/src/main.cpp
renamed: odm_orthophoto/CMakeLists.txt -> modules/odm_orthophoto/CMakeLists.txt
renamed: odm_orthophoto/CMakeLists.txt.user -> modules/odm_orthophoto/CMakeLists.txt.user
renamed: odm_orthophoto/src/Logger.cpp -> modules/odm_orthophoto/src/Logger.cpp
renamed: odm_orthophoto/src/Logger.hpp -> modules/odm_orthophoto/src/Logger.hpp
renamed: odm_orthophoto/src/OdmOrthoPhoto.cpp -> modules/odm_orthophoto/src/OdmOrthoPhoto.cpp
renamed: odm_orthophoto/src/OdmOrthoPhoto.hpp -> modules/odm_orthophoto/src/OdmOrthoPhoto.hpp
renamed: odm_orthophoto/src/main.cpp -> modules/odm_orthophoto/src/main.cpp
renamed: odm_texturing/CMakeLists.txt -> modules/odm_texturing/CMakeLists.txt
renamed: odm_texturing/CMakeLists.txt.user -> modules/odm_texturing/CMakeLists.txt.user
renamed: odm_texturing/src/Logger.cpp -> modules/odm_texturing/src/Logger.cpp
renamed: odm_texturing/src/Logger.hpp -> modules/odm_texturing/src/Logger.hpp
renamed: odm_texturing/src/OdmTexturing.cpp -> modules/odm_texturing/src/OdmTexturing.cpp
renamed: odm_texturing/src/OdmTexturing.hpp -> modules/odm_texturing/src/OdmTexturing.hpp
renamed: odm_texturing/src/main.cpp -> modules/odm_texturing/src/main.cpp
renamed: odm_texturing/src/modifiedPclFunctions.cpp -> modules/odm_texturing/src/modifiedPclFunctions.cpp
renamed: odm_texturing/src/modifiedPclFunctions.hpp -> modules/odm_texturing/src/modifiedPclFunctions.hpp
new file: opendm/__init__.py
new file: opendm/config.py
new file: opendm/context.py
new file: opendm/io.py
new file: opendm/log.py
new file: opendm/system.py
new file: opendm/tasks.py
new file: opendm/types.py
modified: run.py
new file: scripts/__init__.py
new file: scripts/cmvs.py
new file: scripts/dataset.py
new file: scripts/example_ecto_python.py
new file: scripts/odm_app.py
new file: scripts/odm_georeferencing.py
new file: scripts/odm_meshing.py
new file: scripts/odm_orthophoto.py
new file: scripts/odm_texturing.py
new file: scripts/opensfm.py
new file: scripts/pmvs.py
new file: scripts/resize.py
deleted: src/bundler
deleted: vlfeat.tar.gz
|
2016-02-19 11:27:17 -05:00 |