From 49e80bf57ca7bfa4a4200e26534287d1a81abf85 Mon Sep 17 00:00:00 2001 From: ZYXeeker <38578448+zyxeeker@users.noreply.github.com> Date: Wed, 20 Mar 2024 04:11:58 +0800 Subject: [PATCH] [nanomsg] Update nanomsg_BINDIR check (#37529) --- ports/nanomsg/portfile.cmake | 2 +- ports/nanomsg/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/nanomsg.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/nanomsg/portfile.cmake b/ports/nanomsg/portfile.cmake index 20f6856132..3ffb04ee00 100644 --- a/ports/nanomsg/portfile.cmake +++ b/ports/nanomsg/portfile.cmake @@ -53,7 +53,7 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string( ${CURRENT_PACKAGES_DIR}/share/${PORT}/nanomsg-config.cmake - "set_and_check(nanomsg_BINDIR \${PACKAGE_PREFIX_DIR}/bin)" + "set_and_check(nanomsg_BINDIR \${VCPKG_IMPORT_PREFIX}/bin)" "" ) endif() diff --git a/ports/nanomsg/vcpkg.json b/ports/nanomsg/vcpkg.json index a752280770..45a4da0ecd 100644 --- a/ports/nanomsg/vcpkg.json +++ b/ports/nanomsg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nanomsg", "version-semver": "1.2.1", + "port-version": 1, "description": [ "A simple high-performance implementation of several \"scalability protocols\".", "These scalability protocols are light-weight messaging protocols which can be used to solve a number of very common messaging patterns, such as request/reply, publish/subscribe, surveyor/respondent, and so forth. These protocols can run over a variety of transports such as TCP, UNIX sockets, and even WebSocket." diff --git a/versions/baseline.json b/versions/baseline.json index d7a08b4241..d43e24c466 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5990,7 +5990,7 @@ }, "nanomsg": { "baseline": "1.2.1", - "port-version": 0 + "port-version": 1 }, "nanopb": { "baseline": "0.4.7", diff --git a/versions/n-/nanomsg.json b/versions/n-/nanomsg.json index 3cf18d743d..b740d83957 100644 --- a/versions/n-/nanomsg.json +++ b/versions/n-/nanomsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af9d00f361245784a9b5f81fc7a87d1598173dd5", + "version-semver": "1.2.1", + "port-version": 1 + }, { "git-tree": "f153ee28346c2ba03410c8845959d1d549322ecb", "version-semver": "1.2.1",