diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-01-03 19:52:14 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-01-03 19:52:14 -0800 |
| commit | 273f35372c7960dbbcaf78ffcf02b36470e77b16 (patch) | |
| tree | 61d33def7b5bf5229411741a2b4bcd56cfb621ad | |
| parent | b899067edba25c5464a96a5dd2c5cfac5901b785 (diff) | |
| download | vcpkg-273f35372c7960dbbcaf78ffcf02b36470e77b16.tar.gz vcpkg-273f35372c7960dbbcaf78ffcf02b36470e77b16.zip | |
[zeromq] Fix #2476
| -rw-r--r-- | ports/zeromq/CONTROL | 2 | ||||
| -rw-r--r-- | ports/zeromq/portfile.cmake | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL index b850b71b9..2e876f6e1 100644 --- a/ports/zeromq/CONTROL +++ b/ports/zeromq/CONTROL @@ -1,3 +1,3 @@ Source: zeromq -Version: 20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2-1 +Version: 20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2-2 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 77d0da23d..e5a5d567b 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -8,11 +8,6 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${ARCHIVE} -) - string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) @@ -38,6 +33,16 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/ZeroMQ) +file(READ ${CURRENT_PACKAGES_DIR}/share/zeromq/ZeroMQConfig.cmake _contents) +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_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") +endif() +file(WRITE ${CURRENT_PACKAGES_DIR}/share/zeromq/ZeroMQConfig.cmake "${_contents}") + # Handle copyright file(RENAME ${CURRENT_PACKAGES_DIR}/share/zmq/COPYING.LESSER.txt ${CURRENT_PACKAGES_DIR}/share/zeromq/copyright) |