aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Romero Sanchez <viromer@microsoft.com>2019-01-08 16:07:42 -0800
committerVictor Romero Sanchez <viromer@microsoft.com>2019-01-08 16:07:42 -0800
commitbd547e5e39c775a0c3332559e015441d62ff2aa4 (patch)
treea0e9da0ed19010a245efabf928960edcba14c2d6
parent23a62a87fd8de3b870131761204db6d095a76121 (diff)
downloadvcpkg-bd547e5e39c775a0c3332559e015441d62ff2aa4.tar.gz
vcpkg-bd547e5e39c775a0c3332559e015441d62ff2aa4.zip
[libidn2] Use vcpkg_extract_source_archive_ex
-rw-r--r--ports/libidn2/CONTROL2
-rw-r--r--ports/libidn2/portfile.cmake8
2 files changed, 7 insertions, 3 deletions
diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL
index 8496bc396..2fc289034 100644
--- a/ports/libidn2/CONTROL
+++ b/ports/libidn2/CONTROL
@@ -1,4 +1,4 @@
Source: libidn2
-Version: 2.0.5
+Version: 2.0.5-1
Build-Depends: libiconv
Description: GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.
diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake
index 9d02b7679..85cc9e6ce 100644
--- a/ports/libidn2/portfile.cmake
+++ b/ports/libidn2/portfile.cmake
@@ -2,14 +2,18 @@ include(vcpkg_common_functions)
set(IDN2_VERSION 2.0.5)
set(IDN2_FILENAME libidn2-${IDN2_VERSION}.tar.gz)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libidn2-${IDN2_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}"
FILENAME "${IDN2_FILENAME}"
SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79
)
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ REF ${IDN2_VERSION}
+)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/string.h DESTINATION ${SOURCE_PATH}/gl)