kopia lustrzana https://github.com/OpenDroneMap/ODM
Merge pull request #699 from pierotofy/opensfm-update
Updated opensfm to include loky fixpull/708/head
commit
dbfcb85059
|
@ -21,7 +21,7 @@ libexiv2-dev liblas-bin python-matplotlib libatlas-base-dev libgmp-dev libmpfr-d
|
|||
RUN apt-get remove libdc1394-22-dev
|
||||
RUN pip install --upgrade pip
|
||||
RUN pip install setuptools
|
||||
RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/OpenDroneMap/gippy/archive/v0.3.9.tar.gz
|
||||
RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/OpenDroneMap/gippy/archive/v0.3.9.tar.gz loky
|
||||
|
||||
ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages"
|
||||
ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"
|
||||
|
|
|
@ -8,8 +8,8 @@ ExternalProject_Add(${_proj_name}
|
|||
STAMP_DIR ${_SB_BINARY_DIR}/stamp
|
||||
#--Download step--------------
|
||||
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
|
||||
URL https://github.com/mapillary/OpenSfM/archive/0a5a6f07b66088e9b63bddaf29bb8f49dd39f9e4.zip
|
||||
URL_MD5 2ed2c4a31801ddd57740261aaaf97ac9
|
||||
URL https://github.com/mapillary/OpenSfM/archive/6536f7cd0bf026db158af96f1508ff8c0616e9be.zip
|
||||
URL_MD5 588e2e6f26837cb053d668401a75200d
|
||||
#--Update/Patch step----------
|
||||
UPDATE_COMMAND ""
|
||||
#--Configure step-------------
|
||||
|
|
|
@ -76,7 +76,8 @@ install() {
|
|||
exifread \
|
||||
gpxpy \
|
||||
xmltodict \
|
||||
appsettings
|
||||
appsettings \
|
||||
loky
|
||||
|
||||
echo "Installing CGAL dependencies"
|
||||
sudo apt-get install -y -qq libgmp-dev libmpfr-dev
|
||||
|
|
|
@ -19,7 +19,7 @@ libexiv2-dev liblas-bin python-matplotlib libatlas-base-dev libgmp-dev libmpfr-d
|
|||
RUN apt-get remove libdc1394-22-dev
|
||||
RUN pip install --upgrade pip
|
||||
RUN pip install setuptools
|
||||
RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/OpenDroneMap/gippy/archive/v0.3.9.tar.gz
|
||||
RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/OpenDroneMap/gippy/archive/v0.3.9.tar.gz loky
|
||||
|
||||
ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages"
|
||||
ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"
|
||||
|
|
Ładowanie…
Reference in New Issue