Skip to content

[libxml2] add missing GNUInstallDirs to fix pc files #16897

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.

Sign up for GitHub

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

Merged
vicroms merged 11 commits into from
Apr 8, 2021
Merged

[libxml2] add missing GNUInstallDirs to fix pc files #16897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
892e3b0
[libxml2] add missing include of GNUInstallDirs
Neumann-A Mar 26, 2021
93d0f64
add version info
Neumann-A Mar 26, 2021
e9cfff3
add include dir to pc files ....
Neumann-A Mar 26, 2021
226fe4d
update version
Neumann-A Mar 26, 2021
8209029
add escaping
Neumann-A Mar 26, 2021
99fb3a5
version update
Neumann-A Mar 26, 2021
80e6e4c
Merge remote-tracking branch 'upstream/master' into fix_libxml2_pc
Neumann-A Mar 29, 2021
9dd126f
Merge remote-tracking branch 'upstream/master' into fix_libxml2_pc
Neumann-A Apr 6, 2021
5226ca1
Merge remote-tracking branch 'upstream/master' into fix_libxml2_pc
Neumann-A Apr 6, 2021
4bbd708
Merge from master
PhoebeHui Apr 8, 2021
32fd284
Update baseline version
PhoebeHui Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ports/libxml2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down Expand Up @@ -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)
2 changes: 1 addition & 1 deletion ports/libxml2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
10 changes: 5 additions & 5 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -3618,7 +3618,7 @@
},
"libxml2": {
"baseline": "2.9.10",
"port-version": 4
"port-version": 5
},
"libxmlmm": {
"baseline": "0.6.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libxml2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2908a3c4c0454f12d4e14aa954952cb2824bf508",
"version-semver": "2.9.10",
"port-version": 5
},
{
"git-tree": "98c48a2d0545e6d392084260abc6411eb44f0577",
"version-semver": "2.9.10",
Expand Down