Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Ylannl committed Dec 3, 2024
2 parents 8b80303 + 0d463f9 commit 4923f96
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
21 changes: 10 additions & 11 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
{
"name": "geoflow-bundle",
"version-date": "2023-03-21",
"version-date": "2024-03-08",
"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",
"cgal",
"eigen3",
{ "name": "nlohmann-json", "version>=": "3.11.2" },
{ "name": "proj"},
{ "name": "geos", "version>=": "3.10.2" },
"nlohmann-json",
"proj",
"geos",
{
"name": "gdal",
"default-features": false,
"features": [ "postgresql" ],
"version>=": "3.6.3"
"features": ["recommended-features", "postgresql"]
}
],
"builtin-baseline": "b86c0c35b88e2bf3557ff49dc831689c2f085090"
"builtin-baseline": "ab887c562326c686478284d9076d722c1ec4b48c"
}

0 comments on commit 4923f96

Please sign in to comment.