From d8c173c1ae745d102590cb6932a373dd936e6614 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 2 Apr 2025 20:20:23 +0800 Subject: [PATCH 1/5] CI: Fix the vcpkg packages on Windows --- ci/install-dependencies-windows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install-dependencies-windows.sh b/ci/install-dependencies-windows.sh index 5b3a5f6a1f5..68564ffcc5e 100755 --- a/ci/install-dependencies-windows.sh +++ b/ci/install-dependencies-windows.sh @@ -19,7 +19,7 @@ PACKAGE="${PACKAGE:-false}" WIN_PLATFORM=x64-windows # install libraries -vcpkg install netcdf-c gdal[core,tools,default-features] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM} +vcpkg install netcdf-c gdal[core,tools,geos,netcdf] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM} # Executable files search for DLL files in the directories listed in the PATH environment variable. echo "${VCPKG_INSTALLATION_ROOT}/installed/${WIN_PLATFORM}/bin" >> $GITHUB_PATH # Tools like gdal_translate, ogr2ogr are located in tools/gdal From 1886384ed1a216f5008ce1857f7261adf553914a Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 2 Apr 2025 23:09:58 +0800 Subject: [PATCH 2/5] Set CMAKE_INSTALL_PATH --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b56df7f0430..b04778682ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,7 +111,7 @@ jobs: mkdir build cd build call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cmake -G Ninja .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release + cmake -G Ninja .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release --CMAKE_INSTALL_PATH=%INSTALLDIR% cmake --build . if: runner.os == 'Windows' From cae5b9e4c86cbf13457b81701a3e62e48e3c9869 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 2 Apr 2025 23:18:28 +0800 Subject: [PATCH 3/5] fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b04778682ea..8dbaf01c264 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,7 +111,7 @@ jobs: mkdir build cd build call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cmake -G Ninja .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release --CMAKE_INSTALL_PATH=%INSTALLDIR% + cmake -G Ninja .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release --CMAKE_INSTALL_PREFIX=%INSTALLDIR% cmake --build . if: runner.os == 'Windows' From 444060700879fdb31f1abb070678fcfcbb79879a Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 2 Apr 2025 23:25:04 +0800 Subject: [PATCH 4/5] fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8dbaf01c264..43362055e14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,7 +111,7 @@ jobs: mkdir build cd build call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cmake -G Ninja .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release --CMAKE_INSTALL_PREFIX=%INSTALLDIR% + cmake -G Ninja .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%INSTALLDIR% cmake --build . if: runner.os == 'Windows' From ca8722bedb45e9e586103176ef514664440ae5b9 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 9 Apr 2025 22:17:26 +0800 Subject: [PATCH 5/5] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 43362055e14..b56df7f0430 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,7 +111,7 @@ jobs: mkdir build cd build call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cmake -G Ninja .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%INSTALLDIR% + cmake -G Ninja .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release cmake --build . if: runner.os == 'Windows'