aboutsummaryrefslogtreecommitdiff
path: root/ports/zeromq
diff options
context:
space:
mode:
authorWimok Nupphiboon <wimok.mok@gmail.com>2018-04-22 20:35:52 +0700
committerWimok Nupphiboon <wimok.mok@gmail.com>2018-04-22 20:35:52 +0700
commitbefd3c6be2db90e5bc3a7acb2b0103cb6dfd7b42 (patch)
treefd4cfee016003e6be2898ac5d37f679a567cad76 /ports/zeromq
parent4c028691c7f03335f6fb8a38ce80794c213819cb (diff)
parent4f52f53b99f6a5465157958bc99f79cc0b2712ad (diff)
downloadvcpkg-befd3c6be2db90e5bc3a7acb2b0103cb6dfd7b42.tar.gz
vcpkg-befd3c6be2db90e5bc3a7acb2b0103cb6dfd7b42.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'ports/zeromq')
-rw-r--r--ports/zeromq/CONTROL2
-rw-r--r--ports/zeromq/portfile.cmake5
2 files changed, 4 insertions, 3 deletions
diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL
index b333f7440..b74483695 100644
--- a/ports/zeromq/CONTROL
+++ b/ports/zeromq/CONTROL
@@ -1,3 +1,3 @@
Source: zeromq
-Version: 2018-04-05
+Version: 2018-04-17
Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products
diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake
index 8019053f9..a907be9af 100644
--- a/ports/zeromq/portfile.cmake
+++ b/ports/zeromq/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zeromq/libzmq
- REF bb4fb32925c6465fd0f8e8cc89e5347bc79bc4bf
- SHA512 73101b68d93fdf1eca1f83373fe4c946865978d32ca11692e9015a63af8d42ff2d2ff93c88c812f75c2d80596c986df59e62f8de3dc1a016ab24f91f518c24eb
+ REF c971445025535b9f989ab0b78f5ddd1c026f1878
+ SHA512 4eb85e207f53de73cf5369c4c3e79d858ee380e1374ebe807dfc6f99782efc2b98984f48a2cce11b9bf22c7934ef3d1a075cb98fb9e90d5f216a4e128d6df212
HEAD_REF master
)
@@ -43,6 +43,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
string(REPLACE "get_target_property(ZeroMQ_STATIC_LIBRARY libzmq-static LOCATION)" "add_library(libzmq-static INTERFACE IMPORTED)\nset_target_properties(libzmq-static PROPERTIES INTERFACE_LINK_LIBRARIES libzmq)" _contents "${_contents}")
set(_contents "${_contents}\nset(ZeroMQ_STATIC_LIBRARY \${ZeroMQ_LIBRARY})\n")
else()
+ string(REPLACE "get_target_property(ZeroMQ_INCLUDE_DIR libzmq INTERFACE_INCLUDE_DIRECTORIES)" "get_target_property(ZeroMQ_INCLUDE_DIR libzmq-static INTERFACE_INCLUDE_DIRECTORIES)" _contents "${_contents}")
string(REPLACE "get_target_property(ZeroMQ_LIBRARY libzmq LOCATION)" "add_library(libzmq INTERFACE IMPORTED)\nset_target_properties(libzmq PROPERTIES INTERFACE_LINK_LIBRARIES libzmq-static)" _contents "${_contents}")
set(_contents "${_contents}\nset(ZeroMQ_LIBRARY \${ZeroMQ_STATIC_LIBRARY})\n")