ci(vs-build): stop passing the iconv library location explicitly
Something changed in `vcpkg` (which we use in our Visual C++ build to provide the dependencies such as libcurl) and our `vs-build` job started failing in CI. The reason is that we had a work-around in place to help CMake find iconv, and this work-around is neither needed nor does it work anymore. For the full discussion with the vcpkg project, see this comment: https://github.com/microsoft/vcpkg/issues/14780#issuecomment-735368280 Signed-off-by: Dennis Ameling <dennis@dennisameling.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dennis Ameling committed
Dec 4, 2020 at 14:22 UTC
e66590348a78d69b08dff8f6a1d978982e61465a
3 files changed
+2
-3
.github/workflows/main.yml
-1
@@ -201,7 +201,6 @@ jobs:
201
shell: bash
202
run: |
203
cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
204
- -DIconv_LIBRARY=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/lib/libiconv.lib -DIconv_INCLUDE_DIR=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/include \
204
-DMSGFMT_EXE=`pwd`/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
205
- name: MSBuild
206
run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
compat/vcbuild/scripts/clink.pl
+1
-1
@@ -45,7 +45,7 @@ while (@ARGV) {
45
push(@args, "zlib.lib");
46
}
47
} elsif ("$arg" eq "-liconv") {
48
- push(@args, "libiconv.lib");
48
+ push(@args, "iconv.lib");
49
} elsif ("$arg" eq "-lcrypto") {
50
push(@args, "libcrypto.lib");
51
} elsif ("$arg" eq "-lssl") {
contrib/buildsystems/engine.pl
+1
-1
@@ -351,7 +351,7 @@ sub handleLinkLine
351
} elsif ("$part" eq "-lexpat") {
352
push(@libs, "libexpat.lib");
353
} elsif ("$part" eq "-liconv") {
354
- push(@libs, "libiconv.lib");
354
+ push(@libs, "iconv.lib");
355
} elsif ($part =~ /^[-\/]/) {
356
push(@lflags, $part);
357
} elsif ($part =~ /\.(a|lib)$/) {