diff options
| author | Rémy Tassoux <contact@rt2.fr> | 2020-12-07 00:15:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 15:15:28 -0800 |
| commit | 5e7794f3f2784f953d4ca8a92cd816f65cebf41f (patch) | |
| tree | f2f18081566c28afff7efb40f713a4a34f5de7bc | |
| parent | de70813cf38c55bac793f516751a35f843f12ad8 (diff) | |
| download | vcpkg-5e7794f3f2784f953d4ca8a92cd816f65cebf41f.tar.gz vcpkg-5e7794f3f2784f953d4ca8a92cd816f65cebf41f.zip | |
[pugixml] Update to 1.11.1 (#14813)
| -rw-r--r-- | ports/pugixml/CONTROL | 5 | ||||
| -rw-r--r-- | ports/pugixml/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/pugixml/pugixml-v1.10_fix_debug_pkgconfig.patch | 31 |
3 files changed, 4 insertions, 37 deletions
diff --git a/ports/pugixml/CONTROL b/ports/pugixml/CONTROL index 2d4b2a42c..65e673249 100644 --- a/ports/pugixml/CONTROL +++ b/ports/pugixml/CONTROL @@ -1,5 +1,4 @@ Source: pugixml -Version: 1.10 -Port-Version: 2 +Version: 1.11.1 Homepage: https://github.com/zeux/pugixml -Description: C++ XML processing library +Description: Light-weight, simple and fast XML parser for C++ with XPath support diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index a96d0adbe..72381eb5d 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/pugixml - REF v1.10 - SHA512 0634053d4f757b9293997763bb2e51595197c192f3974e954975d6d6ff91e4a6cb7c194efa530e0eef1a2a93db16592c5630010b6482430dff5ffc6879e84b6a + REF v1.11.1 + SHA512 94a79a28d96e763cdd8951c4d0b20aefb43cd1b32cbf5a5354b09f2636710e960e2dbfa56534b61c8d6ddecb2126a006e5f485c1465a97376e1cc077df25f16e HEAD_REF master - PATCHES pugixml-v1.10_fix_debug_pkgconfig.patch # Upstream: https://github.com/zeux/pugixml/pull/363 ) vcpkg_configure_cmake( diff --git a/ports/pugixml/pugixml-v1.10_fix_debug_pkgconfig.patch b/ports/pugixml/pugixml-v1.10_fix_debug_pkgconfig.patch deleted file mode 100644 index 24d428d98..000000000 --- a/ports/pugixml/pugixml-v1.10_fix_debug_pkgconfig.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f043962..b281cba 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,6 +94,16 @@ install(TARGETS ${LIBRARY} EXPORT pugixml-config - install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX}) - install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) - -+if (USE_POSTFIX) -+ if(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo) -+ set(LIB_POSTFIX "_r") -+ elseif(CMAKE_BUILD_TYPE MATCHES MinSizeRel) -+ set(LIB_POSTFIX "_m") -+ elseif(CMAKE_BUILD_TYPE MATCHES Debug) -+ set(LIB_POSTFIX "_d") -+ endif() -+endif() -+ - configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY) - install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig) - -diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in -index f9c3fd4..7958774 100644 ---- a/scripts/pugixml.pc.in -+++ b/scripts/pugixml.pc.in -@@ -8,4 +8,4 @@ Description: Light-weight, simple and fast XML parser for C++ with XPath support - URL: https://pugixml.org/ - Version: @pugixml_VERSION@ - Cflags: -I${includedir} --Libs: -L${libdir} -lpugixml -+Libs: -L${libdir} -lpugixml@LIB_POSTFIX@ |