From 8efb851898397c49109d9e2b51c597250d0672df Mon Sep 17 00:00:00 2001
From: Ravi Peters <r.y.peters@tudelft.nl>
Date: Fri, 8 Mar 2024 16:34:12 +0100
Subject: [PATCH 1/3] 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 <r.y.peters@tudelft.nl>
Date: Fri, 8 Mar 2024 16:42:42 +0100
Subject: [PATCH 2/3] 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 <r.y.peters@tudelft.nl>
Date: Fri, 8 Mar 2024 20:17:44 +0100
Subject: [PATCH 3/3] 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"