diff options
| author | myd7349 <myd7349@gmail.com> | 2021-09-10 12:12:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-09 21:12:21 -0700 |
| commit | b74d9b2519fe52a3fa2cec80dc3b68e1bb3d14e3 (patch) | |
| tree | 8f271137644aeede25514f9849d417f4c2b087fa | |
| parent | f0679e2444508d2f0ac148e9405b45b5c343e4d4 (diff) | |
| download | vcpkg-b74d9b2519fe52a3fa2cec80dc3b68e1bb3d14e3.tar.gz vcpkg-b74d9b2519fe52a3fa2cec80dc3b68e1bb3d14e3.zip | |
[nng] Update to v1.5.1 (#19478)
* [nng] Update to v1.5.1
* [nng] Bump version
* [nng] Quote source path
* [nng] Bump version
| -rw-r--r-- | ports/nng/portfile.cmake | 24 | ||||
| -rw-r--r-- | ports/nng/vcpkg.json | 12 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/n-/nng.json | 5 |
4 files changed, 29 insertions, 14 deletions
diff --git a/ports/nng/portfile.cmake b/ports/nng/portfile.cmake index 770e4656d..60af4ca7e 100644 --- a/ports/nng/portfile.cmake +++ b/ports/nng/portfile.cmake @@ -1,33 +1,33 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanomsg/nng - REF d020adda8f0348d094790618703b8341a26007a3 # version 1.4.0 - SHA512 dbbbee25ddbfece77336b9be9e63ae331b2991cb94a7a71141faf519f02aa1f123f72f89b98964e24ebc5ced786034b6dac60d8ef905376b6fb5fb7dbff49bd6 + REF 9fcf039b573d153ba9bbc2beb5f11259ddacdcff # v1.5.1 + SHA512 3db2668c3f971dc54156df2a3520645224fbb55460957da35940889c3148cb2cbc67c10cd23b9614ece70235d1f6003618310129eb9c40ced42db058c140dd58 HEAD_REF master ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - mbedtls NNG_ENABLE_TLS - tools NNG_ENABLE_NNGCAT + FEATURES + mbedtls NNG_ENABLE_TLS + tools NNG_ENABLE_NNGCAT ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNNG_TESTS=OFF ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nng) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nng) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/nng/nng.h + "${CURRENT_PACKAGES_DIR}/include/nng/nng.h" "defined(NNG_SHARED_LIB)" "0 /* defined(NNG_SHARED_LIB) */" ) @@ -50,6 +50,6 @@ if ("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES nngcat AUTO_CLEAN) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/nng/vcpkg.json b/ports/nng/vcpkg.json index 54a88928a..c89456dfd 100644 --- a/ports/nng/vcpkg.json +++ b/ports/nng/vcpkg.json @@ -1,9 +1,19 @@ { "name": "nng", - "version-string": "1.4.0", + "version-semver": "1.5.1", "description": "nanomsg-next-gen, lightweight messaging library", "homepage": "https://nng.nanomsg.org", "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "mbedtls": { "description": "nng TLS support", diff --git a/versions/baseline.json b/versions/baseline.json index 623227de8..890e59c8b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4473,7 +4473,7 @@ "port-version": 1 }, "nng": { - "baseline": "1.4.0", + "baseline": "1.5.1", "port-version": 0 }, "nngpp": { diff --git a/versions/n-/nng.json b/versions/n-/nng.json index b8ffd04e9..a63b84091 100644 --- a/versions/n-/nng.json +++ b/versions/n-/nng.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "ec4958fd8785c45084ce752f527ab7ef7acd69a7", + "version-semver": "1.5.1", + "port-version": 0 + }, + { "git-tree": "6fce71079b3518a4449743fb055a45a8a881d4a5", "version-string": "1.4.0", "port-version": 0 |