aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcodicodi <rob.ceglinski@gmail.com>2017-08-23 16:07:57 +0200
committercodicodi <rob.ceglinski@gmail.com>2017-08-23 16:07:57 +0200
commit01cbf421ab151dfc4f0c1c18c9a2a1a88b627240 (patch)
tree59c94cb8e344ed89154e7233347bdceddd1768a9
parent57d078e8d1c5f5284d88e79600aa61fa06530ac4 (diff)
downloadvcpkg-01cbf421ab151dfc4f0c1c18c9a2a1a88b627240.tar.gz
vcpkg-01cbf421ab151dfc4f0c1c18c9a2a1a88b627240.zip
[expat] update to 2.2.4
-rw-r--r--ports/expat/CONTROL2
-rw-r--r--ports/expat/portfile.cmake18
2 files changed, 10 insertions, 10 deletions
diff --git a/ports/expat/CONTROL b/ports/expat/CONTROL
index 5987991c8..cee5c9edc 100644
--- a/ports/expat/CONTROL
+++ b/ports/expat/CONTROL
@@ -1,3 +1,3 @@
Source: expat
-Version: 2.1.1-1
+Version: 2.2.4
Description: XML parser library written in C
diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake
index a347ac2cb..3a7430db3 100644
--- a/ports/expat/portfile.cmake
+++ b/ports/expat/portfile.cmake
@@ -1,11 +1,10 @@
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/expat-2.1.1)
-vcpkg_download_distfile(ARCHIVE_FILE
- URLS "http://downloads.sourceforge.net/project/expat/expat/2.1.1/expat-2.1.1.tar.bz2"
- FILENAME "expat-2.1.1.tar.bz2"
- SHA512 088e2ef3434f2affd4fc79fe46f0e9826b9b4c3931ddc780cd18892f1cd1e11365169c6807f45916a56bb6abcc627dcd17a23f970be0bf464f048f5be2713628
-)
-vcpkg_extract_source_archive(${ARCHIVE_FILE})
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO libexpat/libexpat
+ REF R_2_2_4
+ SHA512 64f9deb2f75be70450a60a408ab867d1df800022e29000a31a801d85421178b400ebbf817864d1592ce998ada1012fa25fd896e5f25c6b314851ae62d94b45dc
+ HEAD_REF master)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(EXPAT_LINKAGE ON)
@@ -14,7 +13,8 @@ else()
endif()
vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
+ SOURCE_PATH ${SOURCE_PATH}/expat
+ PREFER_NINJA
OPTIONS
-DBUILD_examples=OFF
-DBUILD_tests=OFF
@@ -25,7 +25,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/expat RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/expat/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/expat RENAME copyright)
vcpkg_copy_pdbs()