Merge branch 'develop' into master

geoflow3d · May 5, 2023 · 5cb1482 · 5cb1482
2 parents b7d6cbf + 2b41e8b
commit 5cb1482
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.21)
 
-project (Geoflow-bundle VERSION 2023.04.23)
+project (Geoflow-bundle VERSION 2023.05.05)
 
 option(GF_BUILD_GUI "Build the GUI components of geoflow" TRUE)
 add_subdirectory(geoflow)

diff --git a/build.bat b/build.bat
@@ -1,7 +1,7 @@
 git submodule update --init --recursive
 
-cmake -Dlaslib_DIR="C:\Users\ravi\git\geoflow-bundle\build-test\vcpkg_installed\x64-windows\share\lastools\LASlib" -DCMAKE_TOOLCHAIN_FILE="C:\Users\ravi\git\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="x64-windows" ..
-
-cmake --build . --parallel 10 --config Release
-
+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 --build . --parallel 32 --config Release
 cpack -C Release --verbose
diff --git a/flowcharts/gfc-brecon b/flowcharts/gfc-brecon
diff --git a/geoflow b/geoflow
diff --git a/vcpkg.json b/vcpkg.json
@@ -6,7 +6,7 @@
     { "name": "boost-geometry", "version>=": "1.77.0" },
     "glm",
     { "name":  "lastools", "version>=": "2020-05-09" },
-    { "name": "cgal", "version>=":  "5.4" },
+    { "name": "cgal", "version>=":  "5.5" },
     "eigen3",
     { "name": "nlohmann-json", "version>=": "3.11.2" },
     { "name": "proj"},
+1 −16		stream/README.md
+537 −10		stream/crop.json
+78 −7		stream/crop_.json
+45 −0		stream/crop_tile_config_writer.json
+47 −0		stream/example-config.toml
+11 −0		stream/justfile
+445 −515		stream/reconstruct.json
+780 −0		stream/tiler.json
+27 −0		stream/tiler_.json
+2,051 −0		stream/visual_reconstruct.json
+9 −1		CMakeLists.txt
+ −		resources/nl_nsgi_nlgeo2018.tif
+ −		resources/nl_nsgi_rdtrans2018.tif
+5 −3		src/geoflow/gui/gfImNodes.hpp