freshlybakedca.ke / git
Git fork
fork atom

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>

authored by

Dennis Ameling and committed by
Junio C Hamano e6659034 898f8073

+2 -3
unified split
-1
.github/workflows/main.yml
··· 201 201 shell: bash 202 202 run: | 203 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 \ 205 204 -DMSGFMT_EXE=`pwd`/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON 206 205 - name: MSBuild 207 206 run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
+1 -1
compat/vcbuild/scripts/clink.pl
··· 45 45 push(@args, "zlib.lib"); 46 46 } 47 47 } elsif ("$arg" eq "-liconv") { 48 - push(@args, "libiconv.lib"); 48 + push(@args, "iconv.lib"); 49 49 } elsif ("$arg" eq "-lcrypto") { 50 50 push(@args, "libcrypto.lib"); 51 51 } elsif ("$arg" eq "-lssl") {
+1 -1
contrib/buildsystems/engine.pl
··· 351 351 } elsif ("$part" eq "-lexpat") { 352 352 push(@libs, "libexpat.lib"); 353 353 } elsif ("$part" eq "-liconv") { 354 - push(@libs, "libiconv.lib"); 354 + push(@libs, "iconv.lib"); 355 355 } elsif ($part =~ /^[-\/]/) { 356 356 push(@lflags, $part); 357 357 } elsif ($part =~ /\.(a|lib)$/) {