From 2b41e8b6016ac7270b20ea34a2a970e21a9a1ae5 Mon Sep 17 00:00:00 2001 From: Ravi Peters Date: Fri, 5 May 2023 10:26:54 +0200 Subject: [PATCH] bump to version 2023.05.05 --- CMakeLists.txt | 2 +- build.bat | 2 +- flowcharts/gfc-brecon | 2 +- geoflow | 2 +- vcpkg.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6409632..42ad8ab 100644 --- 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 index af890ec..da37f82 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 -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\proj4 -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/flowcharts/gfc-brecon b/flowcharts/gfc-brecon index a289095..3cbcde1 160000 --- a/flowcharts/gfc-brecon +++ b/flowcharts/gfc-brecon @@ -1 +1 @@ -Subproject commit a28909514b134d3af2cdab7e06f3ead9cdd31420 +Subproject commit 3cbcde1952c6329fcfc494076f17f1ce1acdaca7 diff --git a/geoflow b/geoflow index 77694ca..b7d9754 160000 --- a/geoflow +++ b/geoflow @@ -1 +1 @@ -Subproject commit 77694ca87bd4fbbace8c061dd344767db6fe875f +Subproject commit b7d9754d9ee4272bfc0424349d09846451781172 diff --git a/vcpkg.json b/vcpkg.json index 7a819c1..df92735 100644 --- 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"},