diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-14 18:21:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-14 18:21:38 (GMT) |
| commit | ccbde2c4f4751096a526527e1aab3e508f093a3f (patch) | |
| tree | 96d05d3fb2e0725e396c1ea564b3b7b39f89cc9e /.github | |
| parent | 3c9f0df16a20071aa6810152dd7f4003f3d96c4b (diff) | |
| parent | e66590348a78d69b08dff8f6a1d978982e61465a (diff) | |
| download | git-ccbde2c4f4751096a526527e1aab3e508f093a3f.zip git-ccbde2c4f4751096a526527e1aab3e508f093a3f.tar.gz git-ccbde2c4f4751096a526527e1aab3e508f093a3f.tar.bz2 | |
Merge branch 'da/vs-build-iconv-fix'
Build update.
* da/vs-build-iconv-fix:
ci(vs-build): stop passing the iconv library location explicitly
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/main.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c3453a..aef6643 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -205,7 +205,6 @@ jobs: shell: bash run: | cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \ - -DIconv_LIBRARY=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/lib/libiconv.lib -DIconv_INCLUDE_DIR=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/include \ -DMSGFMT_EXE=`pwd`/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON - name: MSBuild run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142 |