[libxml2] Config policy same major version (#42326)

This commit is contained in:
Kai Pastor 2024-11-25 21:37:34 +01:00 committed by GitHub
parent 9eb5b23bca
commit 1a87701278
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 14 additions and 37 deletions

View File

@ -56,53 +56,24 @@ index 9701bdc..39e96ee 100644
endif() endif()
install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development) install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development)
@@ -574,30 +560,30 @@ endif() @@ -586,7 +572,7 @@ endif()
configure_package_config_file(
libxml2-config.cmake.cmake.in libxml2-config.cmake
- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2
COMPONENT development
)
write_basic_package_version_file( write_basic_package_version_file(
${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
- COMPATIBILITY ExactVersion - COMPATIBILITY ExactVersion
+ COMPATIBILITY SameMinorVersion + COMPATIBILITY SameMajorVersion
) )
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake @@ -635,7 +621,7 @@ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2
COMPONENT development
)
install(
EXPORT LibXml2
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2
NAMESPACE LibXml2::
FILE libxml2-export.cmake
COMPONENT development
@@ -635,9 +621,7 @@ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY) configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT development) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT development)
-if(WIN32) -if(WIN32)
- set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..") +if(1)
-endif() set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..")
+set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..") endif()
configure_file(xml2-config.in xml2-config @ONLY) configure_file(xml2-config.in xml2-config @ONLY)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xml2-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT development)
diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in
index 88e3963b..0d1706c9 100644 index 88e3963b..0d1706c9 100644
--- a/libxml-2.0.pc.in --- a/libxml-2.0.pc.in

View File

@ -54,7 +54,7 @@ vcpkg_cmake_configure(
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libxml2") vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libxml2-${VERSION}")
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()

View File

@ -1,6 +1,7 @@
{ {
"name": "libxml2", "name": "libxml2",
"version": "2.11.9", "version": "2.11.9",
"port-version": 1,
"description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).",
"homepage": "https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home", "homepage": "https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home",
"license": "MIT", "license": "MIT",

View File

@ -5434,7 +5434,7 @@
}, },
"libxml2": { "libxml2": {
"baseline": "2.11.9", "baseline": "2.11.9",
"port-version": 0 "port-version": 1
}, },
"libxmlmm": { "libxmlmm": {
"baseline": "0.6.0", "baseline": "0.6.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "f3adf0002b5de8cfba4850a6953762ad8ebdfe78",
"version": "2.11.9",
"port-version": 1
},
{ {
"git-tree": "9adc435281d53b3906a7cc7394dfe340edeb1c51", "git-tree": "9adc435281d53b3906a7cc7394dfe340edeb1c51",
"version": "2.11.9", "version": "2.11.9",