windows build fixes

geoflow3d · Mar 8, 2024 · 8efb851 · 8efb851
1 parent f8c2be4
commit 8efb851
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git 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
@@ -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
diff --git a/plugins/gfp-basic3d b/plugins/gfp-basic3d
diff --git a/plugins/gfp-building-reconstruction b/plugins/gfp-building-reconstruction
diff --git 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"
 }
+1 −1		CMakeLists.txt
+3 −2		nodes.hpp
+13 −42		nodes_cityjson.cpp
+4 −7		nodes_gltf.cpp