Skip to content

Fix fallout from upstream libexpat library rename.#709

Merged
Hoikas merged 1 commit intoH-uru:masterfrom
Hoikas:expat
Aug 27, 2020
Merged

Fix fallout from upstream libexpat library rename.#709
Hoikas merged 1 commit intoH-uru:masterfrom
Hoikas:expat

Conversation

@Hoikas
Copy link
Copy Markdown
Member

@Hoikas Hoikas commented Aug 26, 2020

As of libexpat 2.2.8, the library was renamed from libexpat to expat. In 2.2.9, this was supposedly reverted back to libexpat; however, in practice, I find that vcpkg builds libexpatMD. Therefore, we now use libexpat's config. However, this is not present in the most recent devlibs bundle with expat 2.2.7, so we fall back on the out of date cmake find module in that case.

This should fix the latest CI failure in #702.

As of libexpat 2.2.8, the library was renamed from libexpat to expat. In
2.2.9, this was supposedly reverted back to libexpat; however, in practice,
I find that vcpkg builds libexpatMD. Therefore, we now use libexpat's
config. However, this is not present in the most recent devlibs bundle
with expat 2.2.7, so we fall back on the out of date cmake find module
in that case.
@Hoikas Hoikas merged commit 732ad9f into H-uru:master Aug 27, 2020
@Hoikas Hoikas deleted the expat branch August 27, 2020 07:21
Hoikas added a commit to Hoikas/Plasma that referenced this pull request Aug 30, 2020
This reverts commit 732ad9f, reversing
changes made to fde27d9.

The bug fixed by H-uru#709 was fixed by microsoft/vcpkg#13022. The upstream
fix renamed the target `expat::libexpat` to `expat::expat` but also
fixed the expat finder.
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.

2 participants