Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libtorrent] add iconv feature on windows and clean up portfile #11257

Merged
merged 1 commit into from
May 12, 2020

Conversation

FranciscoPombal
Copy link
Contributor

What does your PR fix?

  • Introduces the iconv feature on Windows. Also prevents Windows builds from accidentally picking up Iconv with CMake's built-in FindIconv, which causes builds of software that uses libtorrent to fail linking.
  • Drops the export.hpp customizations. They are not needed anymore. Tested with the method mentioned in [libtorrent] Fix linkage issues for dynamic builds #7345 (comment) with all standard windows triplets, and on linux - no linking failures.
  • Fixes call to vcpkg_fixup_cmake_targets, now target directory uses actual package name (capitalization was wrong)
  • Adjusts some variable names and comments in the portfile

Which triplets are supported/not supported? Have you updated the CI baseline?

No change in triplet support.

Does your PR follow the maintainer guide?

Yes.

ports/libtorrent/portfile.cmake Show resolved Hide resolved
ports/libtorrent/portfile.cmake Show resolved Hide resolved
@JackBoosY
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label May 11, 2020
@JackBoosY
Copy link
Contributor

@strega-nil Could you please review this PR?

Thanks.

@strega-nil
Copy link
Contributor

Thanks @FranciscoPombal, this is awesome :D

@strega-nil strega-nil merged commit 3834f96 into microsoft:master May 12, 2020
@FranciscoPombal FranciscoPombal deleted the improve_libtorrent branch May 12, 2020 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants