diff --git a/CMakeLists.txt b/CMakeLists.txt index e85265a..f07850f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.21) -project (Geoflow-bundle VERSION 2023.09.16) +project (Geoflow-bundle VERSION 2024.03.08) option(GF_BUILD_GUI "Build the GUI components of geoflow" TRUE) add_subdirectory(geoflow) diff --git a/base.dockerfile b/base.dockerfile index 377f984..48a8e18 100644 --- a/base.dockerfile +++ b/base.dockerfile @@ -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 && \ @@ -58,8 +58,9 @@ 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 && \ + apt-get install -y libexpat-dev && \ 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 && \ rm -rf /tmp/FileGDB_API-RHEL7-64gcc83/lib/libstdc++.so* && \ diff --git a/build.bat b/build.bat index da37f82..2f351b4 100644 --- a/build.bat +++ b/build.bat @@ -2,6 +2,6 @@ git submodule update --init --recursive mkdir build-clang cd .\build-clang\ -cmake .. -DGF_BUILD_GUI=ON -DCMAKE_TOOLCHAIN_FILE=C:\Users\ravi\git\vcpkg\scripts\buildsystems\vcpkg.cmake -Dlaslib_DIR=C:\Users\ravi\git\geoflow-bundle\build\vcpkg_installed\x64-windows\share\lastools\LASlib -DPROJ_DATA_DIR=C:\Users\ravi\git\geoflow-bundle\build-clang\vcpkg_installed\x64-windows\share\proj4 -DCMAKE_BUILD_TYPE=Release -T ClangCL +cmake .. -DGF_BUILD_GUI=ON -DCMAKE_TOOLCHAIN_FILE=C:\Users\ravi\git\vcpkg\scripts\buildsystems\vcpkg.cmake -Dlaslib_DIR=C:\Users\ravi\git\geoflow-bundle\build\vcpkg_installed\x64-windows\share\lastools\LASlib -DPROJ_DATA_DIR=C:\Users\ravi\git\geoflow-bundle\build-clang\vcpkg_installed\x64-windows\share\proj -DCMAKE_BUILD_TYPE=Release -T ClangCL cmake --build . --parallel 32 --config Release cpack -C Release --verbose \ No newline at end of file diff --git a/plugins/gfp-basic3d b/plugins/gfp-basic3d index e9023ae..9731c6d 160000 --- a/plugins/gfp-basic3d +++ b/plugins/gfp-basic3d @@ -1 +1 @@ -Subproject commit e9023ae4166345eefe1add65a4b0bef9b50fbcdf +Subproject commit 9731c6dc7fc7211e7b31d696c6df7a6edd1cc7db diff --git a/plugins/gfp-building-reconstruction b/plugins/gfp-building-reconstruction index 629a26b..61bbb6c 160000 --- a/plugins/gfp-building-reconstruction +++ b/plugins/gfp-building-reconstruction @@ -1 +1 @@ -Subproject commit 629a26ba2bbb9209afd66c2b3ab0be41d2f0d71f +Subproject commit 61bbb6c6f53e9b700b1a09944685ecf51d1f257a diff --git a/plugins/gfp-gdal b/plugins/gfp-gdal index ca86a39..d60fede 160000 --- a/plugins/gfp-gdal +++ b/plugins/gfp-gdal @@ -1 +1 @@ -Subproject commit ca86a3989bef76a78e2d521e5cbdf9e09f53f901 +Subproject commit d60fede1ed3fd648f1bdfd2b13805c281ad710cc diff --git a/vcpkg.json b/vcpkg.json index df92735..69bb67a 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,22 +1,21 @@ { "name": "geoflow-bundle", - "version-date": "2023-03-21", + "version-date": "2024-03-08", "dependencies": [ "glfw3", - { "name": "boost-geometry", "version>=": "1.77.0" }, + "boost-geometry", + "boost-format", "glm", - { "name": "lastools", "version>=": "2020-05-09" }, - { "name": "cgal", "version>=": "5.5" }, + "lastools", + "cgal", "eigen3", - { "name": "nlohmann-json", "version>=": "3.11.2" }, - { "name": "proj"}, - { "name": "geos", "version>=": "3.10.2" }, + "nlohmann-json", + "proj", + "geos", { "name": "gdal", - "default-features": false, - "features": [ "postgresql" ], - "version>=": "3.6.3" + "features": ["recommended-features", "postgresql"] } ], - "builtin-baseline": "b86c0c35b88e2bf3557ff49dc831689c2f085090" + "builtin-baseline": "ab887c562326c686478284d9076d722c1ec4b48c" }