diff options
| author | rejbasket <39080670+rejbasket@users.noreply.github.com> | 2024-06-09 13:10:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-09 13:10:57 +0200 |
| commit | a8dcd1fc039eb29ed2c77765660b03038569401b (patch) | |
| tree | 1ad9982dc2ad6635d5db768a4cad9fde485b36ab /bin | |
| parent | 1cc14f7ba686a3c00f99cab8afb2fb2844810a99 (diff) | |
Rejbasket/version geos update (#2979)
* update geos version for linux an win builds
* pinned pyinstaller version
* changed windows build runner to windows-2019
* changed build version for cmake geos build script
---------
Co-authored-by: rejbasket <rejbasket@users.noreply.github.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/build-geos-win.cmd | 10 | ||||
| -rwxr-xr-x | bin/build-linux-dist | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bin/build-geos-win.cmd b/bin/build-geos-win.cmd index 9bd5f3a7..a3b1ca5d 100755 --- a/bin/build-geos-win.cmd +++ b/bin/build-geos-win.cmd @@ -5,13 +5,13 @@ SET GEOS_INSTALL=%CD%\geos-build if NOT DEFINED BUILD32 (SET BUILDFLAG="x64") else (SET BUILDFLAG="Win32")
echo %BUILDFLAG%
-curl -L -O https://github.com/libgeos/geos/releases/download/3.12.1/geos-3.12.1.tar.bz2
+curl -L -O https://github.com/libgeos/geos/releases/download/3.12.2/geos-3.12.2.tar.bz2
-7z x geos-3.12.1.tar.bz2
-7z x geos-3.12.1.tar
+7z x geos-3.12.2.tar.bz2
+7z x geos-3.12.2.tar
-cd geos-3.12.1
-cmake -S . -B _build -G "Visual Studio 17 2022" -A %BUILDFLAG% -DCMAKE_INSTALL_PREFIX=%GEOS_INSTALL% -DCMAKE_GENERATOR_TOOLSET=host=x64
+cd geos-3.12.2
+cmake -S . -B _build -G "Visual Studio 16 2019" -A %BUILDFLAG% -DCMAKE_INSTALL_PREFIX=%GEOS_INSTALL% -DCMAKE_GENERATOR_TOOLSET=host=x64
cmake --build _build --config Release -j 16 --verbose
cd _build
diff --git a/bin/build-linux-dist b/bin/build-linux-dist index d4e89f10..aaa487b4 100755 --- a/bin/build-linux-dist +++ b/bin/build-linux-dist @@ -3,11 +3,11 @@ mkdir $HOME/geos-build GEOS_PATH=$HOME/geos-build # Downloading geos -curl -L -O https://github.com/libgeos/geos/releases/download/3.12.1/geos-3.12.1.tar.bz2 +curl -L -O https://github.com/libgeos/geos/releases/download/3.12.2/geos-3.12.2.tar.bz2 # uzipping geos -tar -xf geos-3.12.1.tar.bz2 -cd geos-3.12.1 +tar -xf geos-3.12.2.tar.bz2 +cd geos-3.12.2 # Building geos mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=$GEOS_PATH -DCMAKE_BUILD_TYPE=Release .. make && make install |