aboutsummaryrefslogtreecommitdiff
path: root/ports/libmspack
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2019-11-22 09:47:40 -0800
committerGitHub <noreply@github.com>2019-11-22 09:47:40 -0800
commit45f4b820e5743b89bca3508ba2028cdd5d8bbd17 (patch)
treef874a8c4a7392309bdbb86447288597ec0a4a281 /ports/libmspack
parent62d67d3bf8eeff1afa8009041fd08b8822676b7b (diff)
parent8831e8f25f1ff6546ee4a5291b91d599421637b3 (diff)
downloadvcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.tar.gz
vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.zip
Merge branch 'master' into vcpkg_nuget
Diffstat (limited to 'ports/libmspack')
-rw-r--r--ports/libmspack/CONTROL2
-rw-r--r--ports/libmspack/portfile.cmake8
2 files changed, 7 insertions, 3 deletions
diff --git a/ports/libmspack/CONTROL b/ports/libmspack/CONTROL
index de476a430..7daf9894e 100644
--- a/ports/libmspack/CONTROL
+++ b/ports/libmspack/CONTROL
@@ -1,5 +1,5 @@
Source: libmspack
-Version: 0.10.1
+Version: 0.10.1-2
Build-Depends:
Homepage: https://www.cabextract.org.uk/libmspack
Description: libmspack is a portable library for some loosely related Microsoft compression formats.
diff --git a/ports/libmspack/portfile.cmake b/ports/libmspack/portfile.cmake
index 759f01724..3da56e9cc 100644
--- a/ports/libmspack/portfile.cmake
+++ b/ports/libmspack/portfile.cmake
@@ -3,14 +3,17 @@ include(vcpkg_common_functions)
set(LIB_NAME libmspack)
set(LIB_VERSION 0.10.1alpha)
set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "https://www.cabextract.org.uk/libmspack/${LIB_FILENAME}"
FILENAME "${LIB_FILENAME}"
SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
)
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+ ARCHIVE ${ARCHIVE}
+ OUT_SOURCE_PATH SOURCE_PATH
+)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH})
@@ -18,6 +21,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/libmspack.def DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
)
vcpkg_install_cmake()