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

Fix up double-conversion and harfbuzz #4285

Merged
merged 3 commits into from
Sep 18, 2018
Merged

Conversation

tronical
Copy link
Contributor

@tronical tronical commented Sep 14, 2018

This pull request fixes the double-conversion build on Linux (implicitly, through bumping to upstream that has fixed cmake targets) and also fixes external harfbuzz usage.

This release also allows removing the workarounds for calling
vcpkg_fixup_cmake_targets twice after renaming *LibraryDepends.cmake
because upstream didn't install *Targets.cmake files. That in turn fixes
using double-conversion on Linux.
@msftclas
Copy link

msftclas commented Sep 14, 2018

CLA assistant check
All CLA requirements met.

When building cmake with autotools, a harfbuzz-config.cmake file gets
installed that makes find_package work. However when building with
cmake, that is omitted. Therefore include a patch from upstream pull
request

    harfbuzz/harfbuzz#1161

to fix that.
@tronical tronical changed the title [double-conversion] Bump to 3.1.0 Fix up double-conversion and harfbuzz Sep 14, 2018
@ras0219-msft ras0219-msft merged commit c7f99a7 into microsoft:master Sep 18, 2018
@ras0219-msft
Copy link
Contributor

Thanks for the PR!

Since these targets aren't provided by upstream harfbuzz, I named them unofficial::harfbuzz:: so they will not conflict with any targets that harfbuzz wants to eventually provide.

@tronical
Copy link
Contributor Author

My PR in harfbuzz to include the cmake targets that were previously only installed when using autoconf but also cmake was accepted upstream. So I think those targets do qualify as official since they originate from upstream. What do you think?

Thanks for merging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants