Skip to content

Commit

Permalink
Merge pull request #2923 from dscho/vs-build-and-libiconv
Browse files Browse the repository at this point in the history
Fix the vs-build job so that CI builds pass again
  • Loading branch information
dscho committed Dec 4, 2020
2 parents ad95d13 + 9310b46 commit 653c3a1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,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
Expand Down
2 changes: 1 addition & 1 deletion compat/vcbuild/scripts/clink.pl
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
push(@args, "zlib.lib");
}
} elsif ("$arg" eq "-liconv") {
push(@args, "libiconv.lib");
push(@args, "iconv.lib");
} elsif ("$arg" eq "-lcrypto") {
push(@args, "libcrypto.lib");
} elsif ("$arg" eq "-lssl") {
Expand Down
2 changes: 1 addition & 1 deletion contrib/buildsystems/engine.pl
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ sub handleLinkLine
} elsif ("$part" eq "-lexpat") {
push(@libs, "libexpat.lib");
} elsif ("$part" eq "-liconv") {
push(@libs, "libiconv.lib");
push(@libs, "iconv.lib");
} elsif ($part =~ /^[-\/]/) {
push(@lflags, $part);
} elsif ($part =~ /\.(a|lib)$/) {
Expand Down

0 comments on commit 653c3a1

Please sign in to comment.