aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLily <47812810+LilyWangL@users.noreply.github.com>2020-04-24 12:43:37 +0800
committerGitHub <noreply@github.com>2020-04-23 21:43:37 -0700
commita3197f135dae514252fad2354cb8d9c6f5100d89 (patch)
tree938f781462e627da70ed3f0e4fbf04d94ee24fb2
parentb896a0da5a8e2d5b831b98d647d1602efbdf259a (diff)
downloadvcpkg-a3197f135dae514252fad2354cb8d9c6f5100d89.tar.gz
vcpkg-a3197f135dae514252fad2354cb8d9c6f5100d89.zip
[nng] update to 1.3.0 (#10974)
-rw-r--r--ports/nng/CONTROL2
-rw-r--r--ports/nng/portfile.cmake15
2 files changed, 7 insertions, 10 deletions
diff --git a/ports/nng/CONTROL b/ports/nng/CONTROL
index 322ec241c..56efe9edc 100644
--- a/ports/nng/CONTROL
+++ b/ports/nng/CONTROL
@@ -1,5 +1,5 @@
Source: nng
-Version: 1.2.5
+Version: 1.3.0
Description: NNG, like its predecessors nanomsg (and to some extent ZeroMQ), is a lightweight, broker-less library, offering a simple API to solve common recurring messaging problems, such as publish/subscribe, RPC-style request/reply, or service discovery.
Homepage: https://github.com/nanomsg/nng
diff --git a/ports/nng/portfile.cmake b/ports/nng/portfile.cmake
index b62865169..e6adad95d 100644
--- a/ports/nng/portfile.cmake
+++ b/ports/nng/portfile.cmake
@@ -1,28 +1,25 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO nanomsg/nng
- REF 53ae1a5ab37fdfc9ad5c236df3eaf4dd63f0fee9
- SHA512 f5532c0b0287df52ddae173dc92eff06d1f4b2b42a2f7afaf28a7736bf70618ae29ccd51fb9743795a8004918a2a2f55233e6ced58829561c745eafa6118b762
+ REF 6ec4107907552db927be8601aed97b5a4b83d33d#version 1.3.0
+ SHA512 28b99d822d7be0348d4e367c2d92cd2bd4a5563806454388ad3c7d9817ef91fa7b4408d15ce4c77ac6a8ad2dd7db173899fdaf7881585282bf57f4c487909be6
HEAD_REF master
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" NNG_STATIC_LIB)
-if("mbedtls" IN_LIST FEATURES)
- set(NNG_ENABLE_TLS ON)
-else()
- set(NNG_ENABLE_TLS OFF)
-endif()
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ mbedtls NNG_ENABLE_TLS
+)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS
+ OPTIONS ${FEATURE_OPTIONS}
-DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
-DNNG_STATIC_LIB=${NNG_STATIC_LIB}
-DNNG_TESTS=OFF
-DNNG_ENABLE_NNGCAT=OFF
- -DNNG_ENABLE_TLS=${NNG_ENABLE_TLS}
)
vcpkg_install_cmake()