From 6870890a157f3438bc077b5140e952ec0f60be2c Mon Sep 17 00:00:00 2001 From: Ylannl Date: Sat, 7 Oct 2023 16:45:09 +0200 Subject: [PATCH 01/15] update plugins --- plugins/gfp-basic3d | 2 +- plugins/gfp-building-reconstruction | 2 +- plugins/gfp-gdal | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/gfp-basic3d b/plugins/gfp-basic3d index 4e444d0..baa73f4 160000 --- a/plugins/gfp-basic3d +++ b/plugins/gfp-basic3d @@ -1 +1 @@ -Subproject commit 4e444d0485d4f43201018bcaa41b13af459b72f3 +Subproject commit baa73f4f045e7e24fe68e8ebb5537342346c1f37 diff --git a/plugins/gfp-building-reconstruction b/plugins/gfp-building-reconstruction index b063ac8..062fe5f 160000 --- a/plugins/gfp-building-reconstruction +++ b/plugins/gfp-building-reconstruction @@ -1 +1 @@ -Subproject commit b063ac896bc9b6cd97eb991a40fe9643256ad18a +Subproject commit 062fe5fd4ec11175a7ac4a5575093e8aa21ce892 diff --git a/plugins/gfp-gdal b/plugins/gfp-gdal index ca86a39..dcfc065 160000 --- a/plugins/gfp-gdal +++ b/plugins/gfp-gdal @@ -1 +1 @@ -Subproject commit ca86a3989bef76a78e2d521e5cbdf9e09f53f901 +Subproject commit dcfc0650194634c16d936d402f22a32a8c3e3697 From eb06a0dd21e51b4b10a18bb94561acce239d4ada Mon Sep 17 00:00:00 2001 From: Ylannl Date: Sat, 7 Oct 2023 17:29:16 +0200 Subject: [PATCH 02/15] update gfp-gdal --- plugins/gfp-gdal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gfp-gdal b/plugins/gfp-gdal index dcfc065..d60fede 160000 --- a/plugins/gfp-gdal +++ b/plugins/gfp-gdal @@ -1 +1 @@ -Subproject commit dcfc0650194634c16d936d402f22a32a8c3e3697 +Subproject commit d60fede1ed3fd648f1bdfd2b13805c281ad710cc From c3c98f9b274cb290c1b026e1fc02502ca6414a63 Mon Sep 17 00:00:00 2001 From: Ravi Peters Date: Tue, 7 Nov 2023 16:24:47 +0100 Subject: [PATCH 03/15] update gdal and CGAL versions --- base.dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base.dockerfile b/base.dockerfile index 377f984..794d596 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,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 && \ From ddd13dec731207e196b8bd46853007c6f6b1858e Mon Sep 17 00:00:00 2001 From: Ravi Peters Date: Tue, 7 Nov 2023 18:06:16 +0100 Subject: [PATCH 04/15] include libexpat for lvbag gdal driver --- base.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/base.dockerfile b/base.dockerfile index 794d596..cf1fe8a 100644 --- a/base.dockerfile +++ b/base.dockerfile @@ -60,6 +60,7 @@ RUN cd /tmp && \ ARG FGDB_VERSION=1.5.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* && \ From aa509a6b0786d9d170720e57aa0f1b19d5ff8641 Mon Sep 17 00:00:00 2001 From: Ravi Peters Date: Tue, 7 Nov 2023 18:09:30 +0100 Subject: [PATCH 05/15] Update base.dockerfile --- base.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base.dockerfile b/base.dockerfile index cf1fe8a..48a8e18 100644 --- a/base.dockerfile +++ b/base.dockerfile @@ -60,7 +60,7 @@ RUN cd /tmp && \ ARG FGDB_VERSION=1.5.2 ARG GDAL_VERSION=3.7.3 RUN cd /tmp && \ - apt-get install -y libexpat-dev + 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* && \ From bb5d91818710218d5159b19f05fb3928bb9c15f1 Mon Sep 17 00:00:00 2001 From: Ravi Peters Date: Thu, 22 Feb 2024 17:51:21 +0100 Subject: [PATCH 06/15] update plugins --- plugins/gfp-basic3d | 2 +- plugins/gfp-building-reconstruction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/gfp-basic3d b/plugins/gfp-basic3d index baa73f4..6cb686e 160000 --- a/plugins/gfp-basic3d +++ b/plugins/gfp-basic3d @@ -1 +1 @@ -Subproject commit baa73f4f045e7e24fe68e8ebb5537342346c1f37 +Subproject commit 6cb686e837c5ae31ab3ed8e65cb51940b7531b1d diff --git a/plugins/gfp-building-reconstruction b/plugins/gfp-building-reconstruction index 062fe5f..b4d40f1 160000 --- a/plugins/gfp-building-reconstruction +++ b/plugins/gfp-building-reconstruction @@ -1 +1 @@ -Subproject commit 062fe5fd4ec11175a7ac4a5575093e8aa21ce892 +Subproject commit b4d40f1698d11d01686c2cb549d21acae166a0dc From aed6cecf58035b024a523c4a059e12a1efb1ba29 Mon Sep 17 00:00:00 2001 From: Ylannl Date: Fri, 23 Feb 2024 12:19:48 +0100 Subject: [PATCH 07/15] debug slope/azimuth code --- plugins/gfp-basic3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gfp-basic3d b/plugins/gfp-basic3d index 6cb686e..41936e6 160000 --- a/plugins/gfp-basic3d +++ b/plugins/gfp-basic3d @@ -1 +1 @@ -Subproject commit 6cb686e837c5ae31ab3ed8e65cb51940b7531b1d +Subproject commit 41936e60480107545f32f2a90a1b2b80deb80161 From f23528768d59244a5a8974f4e623a00dc9135efc Mon Sep 17 00:00:00 2001 From: Ylannl Date: Fri, 23 Feb 2024 21:59:55 +0100 Subject: [PATCH 08/15] update plugins --- plugins/gfp-basic3d | 2 +- plugins/gfp-building-reconstruction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/gfp-basic3d b/plugins/gfp-basic3d index 41936e6..ee0e743 160000 --- a/plugins/gfp-basic3d +++ b/plugins/gfp-basic3d @@ -1 +1 @@ -Subproject commit 41936e60480107545f32f2a90a1b2b80deb80161 +Subproject commit ee0e743f57467ff4b75ea3e12005e4e5e14ba7ea diff --git a/plugins/gfp-building-reconstruction b/plugins/gfp-building-reconstruction index b4d40f1..d16ea6c 160000 --- a/plugins/gfp-building-reconstruction +++ b/plugins/gfp-building-reconstruction @@ -1 +1 @@ -Subproject commit b4d40f1698d11d01686c2cb549d21acae166a0dc +Subproject commit d16ea6c6132a13be2f9505cd9ad700b030c381a8 From 697e52fe725a7bfcc0873c44c215980b5a985ebc Mon Sep 17 00:00:00 2001 From: Ylannl Date: Mon, 26 Feb 2024 15:43:06 +0100 Subject: [PATCH 09/15] update gfp-basic3d --- plugins/gfp-basic3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gfp-basic3d b/plugins/gfp-basic3d index ee0e743..9731c6d 160000 --- a/plugins/gfp-basic3d +++ b/plugins/gfp-basic3d @@ -1 +1 @@ -Subproject commit ee0e743f57467ff4b75ea3e12005e4e5e14ba7ea +Subproject commit 9731c6dc7fc7211e7b31d696c6df7a6edd1cc7db From 6597513d47a8897d60f5df2ab860b3d778f42e1f Mon Sep 17 00:00:00 2001 From: Ylannl Date: Wed, 28 Feb 2024 00:00:30 +0100 Subject: [PATCH 10/15] update gfp-basic3d plugin --- plugins/gfp-basic3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gfp-basic3d b/plugins/gfp-basic3d index 9731c6d..d9fece1 160000 --- a/plugins/gfp-basic3d +++ b/plugins/gfp-basic3d @@ -1 +1 @@ -Subproject commit 9731c6dc7fc7211e7b31d696c6df7a6edd1cc7db +Subproject commit d9fece1f958b56f77a0a9c4eec2bb0c060a73040 From acf287ff4aa3692ad3e6c51d94f772aa5673e598 Mon Sep 17 00:00:00 2001 From: Ylannl Date: Wed, 28 Feb 2024 10:17:35 +0100 Subject: [PATCH 11/15] update gfp-basic3d plugin --- plugins/gfp-basic3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gfp-basic3d b/plugins/gfp-basic3d index d9fece1..e832154 160000 --- a/plugins/gfp-basic3d +++ b/plugins/gfp-basic3d @@ -1 +1 @@ -Subproject commit d9fece1f958b56f77a0a9c4eec2bb0c060a73040 +Subproject commit e832154d8db6702306ca4e137f7f58cf7133c2d5 From fa4d32cee2223f36007453c5d6d9717c7e6bbe4b Mon Sep 17 00:00:00 2001 From: Ylannl Date: Wed, 28 Feb 2024 10:53:30 +0100 Subject: [PATCH 12/15] update gfp-building-reconstruction --- plugins/gfp-building-reconstruction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gfp-building-reconstruction b/plugins/gfp-building-reconstruction index d16ea6c..ddc11cf 160000 --- a/plugins/gfp-building-reconstruction +++ b/plugins/gfp-building-reconstruction @@ -1 +1 @@ -Subproject commit d16ea6c6132a13be2f9505cd9ad700b030c381a8 +Subproject commit ddc11cf829ae932ddc876bc1a162b15bf2f6661e From 8efb851898397c49109d9e2b51c597250d0672df Mon Sep 17 00:00:00 2001 From: Ravi Peters Date: Fri, 8 Mar 2024 16:34:12 +0100 Subject: [PATCH 13/15] windows build fixes --- CMakeLists.txt | 2 +- build.bat | 2 +- plugins/gfp-basic3d | 2 +- plugins/gfp-building-reconstruction | 2 +- vcpkg.json | 26 +++++++++++++++++--------- 5 files changed, 21 insertions(+), 13 deletions(-) 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/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 e832154..baa73f4 160000 --- a/plugins/gfp-basic3d +++ b/plugins/gfp-basic3d @@ -1 +1 @@ -Subproject commit e832154d8db6702306ca4e137f7f58cf7133c2d5 +Subproject commit baa73f4f045e7e24fe68e8ebb5537342346c1f37 diff --git a/plugins/gfp-building-reconstruction b/plugins/gfp-building-reconstruction index ddc11cf..1e9de98 160000 --- a/plugins/gfp-building-reconstruction +++ b/plugins/gfp-building-reconstruction @@ -1 +1 @@ -Subproject commit ddc11cf829ae932ddc876bc1a162b15bf2f6661e +Subproject commit 1e9de989aff68f8457721ccd51b7b0cd76f0913d diff --git a/vcpkg.json b/vcpkg.json index df92735..26d8652 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,20 +3,28 @@ "version-date": "2023-03-21", "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", + { + "name": "cgal", + "version>=": "5.5" + }, "eigen3", - { "name": "nlohmann-json", "version>=": "3.11.2" }, - { "name": "proj"}, - { "name": "geos", "version>=": "3.10.2" }, + { + "name": "nlohmann-json", + "version>=": "3.11.2" + }, + "proj", + "geos", { "name": "gdal", "default-features": false, - "features": [ "postgresql" ], - "version>=": "3.6.3" + "features": [ + "postgresql" + ] } ], - "builtin-baseline": "b86c0c35b88e2bf3557ff49dc831689c2f085090" + "builtin-baseline": "ab887c562326c686478284d9076d722c1ec4b48c" } From 8309544bf4e05ab81800685fa4baecee8154bf07 Mon Sep 17 00:00:00 2001 From: Ravi Peters Date: Fri, 8 Mar 2024 16:42:42 +0100 Subject: [PATCH 14/15] uodate gfp-basic3d --- plugins/gfp-basic3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gfp-basic3d b/plugins/gfp-basic3d index baa73f4..9731c6d 160000 --- a/plugins/gfp-basic3d +++ b/plugins/gfp-basic3d @@ -1 +1 @@ -Subproject commit baa73f4f045e7e24fe68e8ebb5537342346c1f37 +Subproject commit 9731c6dc7fc7211e7b31d696c6df7a6edd1cc7db From 0d463f90a27ec89c4dab8f11dcc52cc28b7da4e2 Mon Sep 17 00:00:00 2001 From: Ravi Peters Date: Fri, 8 Mar 2024 20:17:44 +0100 Subject: [PATCH 15/15] improve windows build --- plugins/gfp-building-reconstruction | 2 +- vcpkg.json | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/plugins/gfp-building-reconstruction b/plugins/gfp-building-reconstruction index 1e9de98..61bbb6c 160000 --- a/plugins/gfp-building-reconstruction +++ b/plugins/gfp-building-reconstruction @@ -1 +1 @@ -Subproject commit 1e9de989aff68f8457721ccd51b7b0cd76f0913d +Subproject commit 61bbb6c6f53e9b700b1a09944685ecf51d1f257a diff --git a/vcpkg.json b/vcpkg.json index 26d8652..69bb67a 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,29 +1,20 @@ { "name": "geoflow-bundle", - "version-date": "2023-03-21", + "version-date": "2024-03-08", "dependencies": [ "glfw3", "boost-geometry", "boost-format", "glm", "lastools", - { - "name": "cgal", - "version>=": "5.5" - }, + "cgal", "eigen3", - { - "name": "nlohmann-json", - "version>=": "3.11.2" - }, + "nlohmann-json", "proj", "geos", { "name": "gdal", - "default-features": false, - "features": [ - "postgresql" - ] + "features": ["recommended-features", "postgresql"] } ], "builtin-baseline": "ab887c562326c686478284d9076d722c1ec4b48c"