diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-04-07 04:16:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-07 04:16:43 -0700 |
| commit | 47cc5760d2a243901e0c6ba0153d9f0dc0ca37e0 (patch) | |
| tree | 2bdd0bc9eb8cd8bdb5a93e550cd05252e258c077 | |
| parent | 269e78bb610369cbdc193be92c4fdd5bba1f7831 (diff) | |
| parent | be4f6f3ffc91795c0ae6d5641d370277c447408a (diff) | |
| download | vcpkg-47cc5760d2a243901e0c6ba0153d9f0dc0ca37e0.tar.gz vcpkg-47cc5760d2a243901e0c6ba0153d9f0dc0ca37e0.zip | |
Merge pull request #3216 from RT222/pugixml
[pugixml] Update to version 1.9
| -rw-r--r-- | ports/pugixml/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pugixml/portfile.cmake | 45 | ||||
| -rw-r--r-- | ports/pugixml/pugixmlapi.patch | 13 |
3 files changed, 24 insertions, 36 deletions
diff --git a/ports/pugixml/CONTROL b/ports/pugixml/CONTROL index eb1f4e634..5e2dad599 100644 --- a/ports/pugixml/CONTROL +++ b/ports/pugixml/CONTROL @@ -1,3 +1,3 @@ Source: pugixml -Version: 1.8.1-3 +Version: 1.9-1 Description: C++ XML processing library diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index 889063223..b0ec2cc58 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -1,32 +1,33 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pugixml-1.8) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/zeux/pugixml/releases/download/v1.8.1/pugixml-1.8.1.zip" - FILENAME "pugixml-1.8.1.zip" - SHA512 683fe224a9bcac032d78cb44d03915a3766d2faa588f3a8486b5719f26eeba3e17d447edf70e1907f51f8649ffb4607b6badd1365e4c15cf24279bf577dc853e + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zeux/pugixml + REF v1.9 + SHA512 f97941941d98a1a056087edc0dde6376bf2cc12ce4523b67a2f2ec5ae0895c2a2e55da32fcca6a997f1a0d918c5f39564167da0a07ce0d7da92880ad8631c31e + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - ) -else() - vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/pugixmlapi.patch - ) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DBUILD_DEFINES="PUGIXML_API=__declspec\(dllexport\)" - ) -endif() +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} +) vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/pugixml") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/pugixml RENAME copyright) diff --git a/ports/pugixml/pugixmlapi.patch b/ports/pugixml/pugixmlapi.patch deleted file mode 100644 index 177664dbe..000000000 --- a/ports/pugixml/pugixmlapi.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/pugixml.hpp b/src/pugixml.hpp -index 4d76bfa..75a4f8a 100644 ---- a/src/pugixml.hpp -+++ b/src/pugixml.hpp -@@ -50,7 +50,7 @@ - - // If no API is defined, assume default - #ifndef PUGIXML_API --# define PUGIXML_API -+# define PUGIXML_API __declspec(dllimport) - #endif - - // If no API for classes is defined, assume default |