check if libxml2 includes are in a libxml2 subdirectory#184
check if libxml2 includes are in a libxml2 subdirectory#184dginev merged 3 commits intoKWARC:masterfrom
Conversation
|
Thank you for the contribution! Is there a way to induce the new Windows behavior in our Github CI? It would be nice to see the previous version fail and this one pass, to be sure the problem is addressed. I can do that too since you've disclosed the version, but it will take me a while. |
|
I opened up an issue in vcpkg repo, if the subdirectory is expected or not: microsoft/vcpkg#47155 |
I'll check that. |
…ms to be standard
|
I did a lot of research. vcpkg recommends using cmake or pkg-config and not relying on the main include path. pkg-config is not available on Windows by default, so better not use it. The libxml2 includes seem to be in a libxml2 subdirectory on other platforms too (e.g Debian Linux). So I added the subdirectory to the include of vcpkg too. Even older versions of the vcpkg repo have the libxml2 subdirectory. |
|
@dginev Can we go ahead and merge this PR? There's still an ongoing discussion at vcpkg, but my change is just compatible with all versions. Right now, I cannot use the latest vcpkg version, because the libxml crate doesn't compile anymore. |
|
Looks good, thanks |
Issue
With the latest update of libxml2 for Windows (vcpkg) to version 2.14.5, the include path has been moved to a
libxml2subdirectory.Fix
If a
libxml2subdirectory exists, switch to it. Otherwise, stay with the original include path.Note
The latest
cargo fmtapplied some format changes.