diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt index cd6de432609..2c11f0db4e4 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 cf516de7b4e..ac7957af22d 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 4d7d080f7a8..3c3d78d32aa 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 40b026f1cc6..b30af65644c 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2908a3c4c0454f12d4e14aa954952cb2824bf508", + "version-semver": "2.9.10", + "port-version": 5 + }, { "git-tree": "98c48a2d0545e6d392084260abc6411eb44f0577", "version-semver": "2.9.10",