aboutsummaryrefslogtreecommitdiff
path: root/ports/cppzmq
diff options
context:
space:
mode:
authormartin-s <webmaster@macside.net>2017-11-05 19:13:16 +0100
committermartin-s <webmaster@macside.net>2017-11-05 19:13:16 +0100
commitd5a7da6bcb92b551d6f8a9a321deb063f6632dbc (patch)
tree9dfef57f1fb3611bde577cab7b9dee9411ffb041 /ports/cppzmq
parentc6d69fac625706c52fc8e48615bc0c6d7b8dad25 (diff)
parent330b8d8bab6a3d07165bf7c05fea09a8e0d56348 (diff)
downloadvcpkg-d5a7da6bcb92b551d6f8a9a321deb063f6632dbc.tar.gz
vcpkg-d5a7da6bcb92b551d6f8a9a321deb063f6632dbc.zip
Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013
# Conflicts: # scripts/cmake/vcpkg_configure_cmake.cmake # toolsrc/src/vcpkg/vcpkgpaths.cpp
Diffstat (limited to 'ports/cppzmq')
-rw-r--r--ports/cppzmq/CONTROL2
-rw-r--r--ports/cppzmq/portfile.cmake13
2 files changed, 8 insertions, 7 deletions
diff --git a/ports/cppzmq/CONTROL b/ports/cppzmq/CONTROL
index bbf80d29a..39928046d 100644
--- a/ports/cppzmq/CONTROL
+++ b/ports/cppzmq/CONTROL
@@ -1,4 +1,4 @@
Source: cppzmq
-Version: 4.2.1
+Version: 4.2.2
Build-Depends: zeromq
Description: lightweight messaging kernel, C++ bindings
diff --git a/ports/cppzmq/portfile.cmake b/ports/cppzmq/portfile.cmake
index fdfc86257..4f0701c59 100644
--- a/ports/cppzmq/portfile.cmake
+++ b/ports/cppzmq/portfile.cmake
@@ -1,12 +1,13 @@
#header-only library
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cppzmq-4.2.1)
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/zeromq/cppzmq/archive/v4.2.1.zip"
- FILENAME "cppzmq-4.2.1.zip"
- SHA512 ee75ce4bd28ecb5ef660d1ed6f5522654eced6ded8745dc0c61df351f4ff0ff8980d1bd848b2649fcce4aa539a457e56e55b0a59cb49f44b0a29875d0ea28dce
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO zeromq/cppzmq
+ REF v4.2.2
+ SHA512 5f61ea4a16987c1363c3029cf46b3e83ddd86d65e8d639b0332d691f8fdb5cee121b5d72a9b8c89221daf52ea5892219e0bc4ea4e761bb1e7deb1659011dd3c9
+ HEAD_REF master
)
-vcpkg_extract_source_archive(${ARCHIVE})
# cppzmq is a single header library, so we just need to copy that file in the include directory
file(INSTALL ${SOURCE_PATH}/zmq.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)