3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 05:18:02 +08:00
Code Issues Projects Releases Wiki Activity

[nng] Update to 1.1.0 (#4726)

Browse Source
This commit is contained in:
myd7349 2018-11-17 09:42:31 +08:00 committed by Robert Schumacher
parent 13e7f60bca
commit 6633d421b7
3 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/nng/CONTROL
View File

@ -1,5 +1,5 @@
Source: nng Source: nng
Version: 1.0.1 Version: 1.1.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. 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.
Feature: mbedtls Feature: mbedtls

14
ports/nng/fix-include-path.patch
View File

@ -1,14 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e59ee5b..b5f6a0d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -238,6 +238,9 @@ set_target_properties (${PROJECT_NAME} ${PROJECT_NAME}
target_link_libraries (${PROJECT_NAME} PRIVATE ${NNG_REQUIRED_LIBRARIES})
target_link_libraries (${PROJECT_NAME} PRIVATE Threads::Threads)
+# See: https://github.com/nanomsg/nanomsg/pull/949/
+target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
+
install (TARGETS ${PROJECT_NAME}
EXPORT ${PROJECT_NAME}-target
FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library

19
ports/nng/portfile.cmake
View File

@ -3,10 +3,9 @@ include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO nanomsg/nng REPO nanomsg/nng
REF ce9f0cb155ad0e97cfc7703d9d7c8e5bec3201bc REF v1.1.0
SHA512 e1fca685e3397398bd259d126560902e813d1e2fb5cdb04de9d3f2fd74961f53af53dbaf9a555113a5588f07a3859d16bdc64f0a0ff65a7b5cf89965e764e68d SHA512 79f8d66cdf1d8f0f50f888edf59b46671ca7439d1da0f25e5f729bd1365b4bc2969c90a377bbd25c41f84eeb231d03fb0bc7c2d5435e3e55f4cf80ae62f9b934
HEAD_REF master HEAD_REF master
PATCHES fix-include-path.patch
) )
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" NNG_STATIC_LIB) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" NNG_STATIC_LIB)
@ -31,21 +30,11 @@ vcpkg_configure_cmake(
vcpkg_install_cmake() vcpkg_install_cmake()
# Move CMake config files to the right place # Move CMake config files to the right place
if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nng)
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
endif()
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/nng)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nng)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Put the licence file where vcpkg expects it # Put the licence file where vcpkg expects it
file(COPY configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/nng/copyright COPYONLY)
${SOURCE_PATH}/LICENSE.txt
DESTINATION ${CURRENT_PACKAGES_DIR}/share/nng)
file(RENAME
${CURRENT_PACKAGES_DIR}/share/nng/LICENSE.txt
${CURRENT_PACKAGES_DIR}/share/nng/copyright)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()