From 68a27fb1ee36a35e5aace06a73c8949f3fe47852 Mon Sep 17 00:00:00 2001 From: Bert Huijben Date: Wed, 19 Jun 2024 13:47:11 +0200 Subject: [PATCH] More work for 9.4.1 --- .github/workflows/msbuild.yml | 3 ++- README.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index be898be..c280a5f 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -41,7 +41,8 @@ jobs: uses: Malcolmnixon/Setup-VSTest@v4 - name: Ensure Proj packages are available - run: ${{env.vcpkgExe}} install "tiff[core]:x64-windows-static-md" "proj[core,tiff]:x64-windows-static-md" "tiff[core]:x86-windows-static-md" "proj[core,tiff]:x86-windows-static-md" "tiff[core]:arm64-windows-static-md" "proj[core,tiff]:arm64-windows-static-md" + run: ${{env.vcpkgExe}} install "proj[core,tiff]:x64-windows-static-md" "proj[core,tiff]:x86-windows-static-md" "proj[core,tiff]:arm64-windows-static-md" "tiff[core,zip]:x64-windows-static-md" "tiff[core,zip]:x86-windows-static-md" "tiff[core,zip]:arm64-windows-static-md" + - name: Setup version working-directory: ${{env.GITHUB_WORKSPACE}} diff --git a/README.md b/README.md index dccd160..4c1cc3d 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Setup build environment using: git clone https://github.com/AmpScm/SharpProj.git cd vcpkg bootstrap-vcpkg.bat - vcpkg install proj[core,tiff]:x86-windows-static-md proj[core,tiff]:x64-windows-static-md tiff[core,lzma,zip]:x86-windows-static-md tiff[core,lzma,zip]:x64-windows-static-md + vcpkg install proj[core,tiff]:x64-windows-static-md proj[core,tiff]:x86-windows-static-md proj[core,tiff]:arm64-windows-static-md tiff[core,zip]:x64-windows-static-md tiff[core,zip]:x86-windows-static-md tiff[core,zip]:arm64-windows-static-md cd .. The explicit feature selection here explicitly builds PROJ without the builtin network support to remove the curl dependency. It also disables 'jpeg' support in tiff.