diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-04-08 20:59:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-08 11:59:57 -0700 |
| commit | d46fc1f4433c27c402313ae75292314e755e7af3 (patch) | |
| tree | 89b43da619da27a04adf7db22884943c38cc6e9d | |
| parent | bbd847b24640e7dc556d2bfca6e4f5eddddc2c40 (diff) | |
| download | vcpkg-d46fc1f4433c27c402313ae75292314e755e7af3.tar.gz vcpkg-d46fc1f4433c27c402313ae75292314e755e7af3.zip | |
[libxml2] add missing GNUInstallDirs to fix pc files (#16897)
* [libxml2] add missing include of GNUInstallDirs
* add version info
* add include dir to pc files ....
* update version
* add escaping
* version update
* Update baseline version
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
| -rw-r--r-- | ports/libxml2/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ports/libxml2/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 10 | ||||
| -rw-r--r-- | versions/l-/libxml2.json | 5 |
4 files changed, 13 insertions, 7 deletions
diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt index cd6de4326..2c11f0db4 100644 --- a/ports/libxml2/CMakeLists.txt +++ b/ports/libxml2/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(libxml2 C) - +include(GNUInstallDirs) set(WITH_TRIO 0 CACHE BOOL "Add trio support") set(WITH_THREADS 1 CACHE BOOL "Add multithread support") set(WITH_THREAD_ALLOC 0 CACHE BOOL "Add per-thread memory") @@ -170,6 +170,7 @@ set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR}) set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) +set(XML_INCLUDEDIR "-I\"\${includedir}\"") configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY) install(FILES ${CMAKE_BINARY_DIR}/libxml-2.0.pc DESTINATION lib/pkgconfig)
\ No newline at end of file diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index cf516de7b..ac7957af2 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxml2", "version-semver": "2.9.10", - "port-version": 4, + "port-version": 5, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4d7d080f7..3c3d78d32 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -332,14 +332,14 @@ "baseline": "4.8.30", "port-version": 5 }, - "bext-ut": { - "baseline": "1.1.8", - "port-version": 0 - }, "bext-di": { "baseline": "1.2.0", "port-version": 0 }, + "bext-ut": { + "baseline": "1.1.8", + "port-version": 0 + }, "bfgroup-lyra": { "baseline": "1.5", "port-version": 1 @@ -3618,7 +3618,7 @@ }, "libxml2": { "baseline": "2.9.10", - "port-version": 4 + "port-version": 5 }, "libxmlmm": { "baseline": "0.6.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 40b026f1c..b30af6564 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "2908a3c4c0454f12d4e14aa954952cb2824bf508", + "version-semver": "2.9.10", + "port-version": 5 + }, + { "git-tree": "98c48a2d0545e6d392084260abc6411eb44f0577", "version-semver": "2.9.10", "port-version": 4 |