Skip to content

Commit

Permalink
Merge pull request #28 from geoflow3d:develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@Ylannl
Ylannl authored Nov 7, 2023
2 parents 9ae0dbe + c3c98f9 commit 2e54c0f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions base.dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN cd /tmp && \
rm -rf /tmp/* && \
mkdir /tmp/geoflow-bundle

ARG CGAL_VERSION=5.4
ARG CGAL_VERSION=5.5
RUN cd /tmp && \
apt-get install -y libboost-system-dev libboost-thread-dev libgmp-dev libmpfr-dev zlib1g-dev && \
wget https://github.com/CGAL/cgal/releases/download/v${CGAL_VERSION}/CGAL-${CGAL_VERSION}.tar.xz && \
Expand All @@ -58,7 +58,7 @@ RUN cd /tmp && \
rm -rf /tmp/*

ARG FGDB_VERSION=1.5.2
ARG GDAL_VERSION=3.6.2
ARG GDAL_VERSION=3.7.3
RUN cd /tmp && \
git clone https://github.com/Esri/file-geodatabase-api.git && \
tar -xf file-geodatabase-api/FileGDB_API_${FGDB_VERSION}/FileGDB_API-RHEL7-64gcc83.tar.gz && \
Expand Down
2 changes: 1 addition & 1 deletion plugins/gfp-basic3d
Submodule gfp-basic3d updated 3 files
+1 −1 CMakeLists.txt
+23 −6 nodes_cityjson.cpp
+4 −7 nodes_gltf.cpp
2 changes: 1 addition & 1 deletion plugins/gfp-building-reconstruction
Submodule gfp-building-reconstruction updated 2 files
+1 −1 CMakeLists.txt
+4 −1 src/polygon_triangulate.cpp
2 changes: 1 addition & 1 deletion plugins/gfp-gdal
Submodule gfp-gdal updated 1 files
+15 −1 ogr_writer_node.cpp

0 comments on commit 2e54c0f

Please sign in to comment.