diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-01-21 15:42:42 -0800 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2020-01-21 15:42:42 -0800 |
| commit | 3f62e5d55d1a7d8905df35d5c441d6e9ad64ffdf (patch) | |
| tree | 55d66a78d4254143bf4213158b97ec7005497552 | |
| parent | 70ee8b83e52ffd4530c27696cd99f4fb874ccb0b (diff) | |
| download | vcpkg-3f62e5d55d1a7d8905df35d5c441d6e9ad64ffdf.tar.gz vcpkg-3f62e5d55d1a7d8905df35d5c441d6e9ad64ffdf.zip | |
[mosquitto] Install mosquittopp.lib to dest (#9754)
| -rw-r--r-- | ports/mosquitto/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mosquitto/archive-dest.patch | 17 | ||||
| -rw-r--r-- | ports/mosquitto/portfile.cmake | 2 |
3 files changed, 17 insertions, 4 deletions
diff --git a/ports/mosquitto/CONTROL b/ports/mosquitto/CONTROL index 126fa2a72..b5b8e4443 100644 --- a/ports/mosquitto/CONTROL +++ b/ports/mosquitto/CONTROL @@ -1,5 +1,5 @@ Source: mosquitto
-Version: 1.6.7-1
+Version: 1.6.7-2
Build-Depends: c-ares, libwebsockets, openssl, pthreads
Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1.
MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
diff --git a/ports/mosquitto/archive-dest.patch b/ports/mosquitto/archive-dest.patch index 11a9ccce4..40d6c1f6d 100644 --- a/ports/mosquitto/archive-dest.patch +++ b/ports/mosquitto/archive-dest.patch @@ -1,8 +1,8 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 221c230..1bd4e96 100644
+index e1521f1..bd60b75 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
-@@ -89,7 +89,7 @@ set_target_properties(libmosquitto PROPERTIES
+@@ -87,7 +87,7 @@ set_target_properties(libmosquitto PROPERTIES
SOVERSION 1
)
@@ -11,3 +11,16 @@ index 221c230..1bd4e96 100644 if (WITH_STATIC_LIBRARIES)
add_library(libmosquitto_static STATIC ${C_SRC})
+diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
+index b39ac3f..5805244 100644
+--- a/lib/cpp/CMakeLists.txt
++++ b/lib/cpp/CMakeLists.txt
+@@ -13,7 +13,7 @@ set_target_properties(mosquittopp PROPERTIES
+ VERSION ${VERSION}
+ SOVERSION 1
+ )
+-install(TARGETS mosquittopp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++install(TARGETS mosquittopp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+
+ if (WITH_STATIC_LIBRARIES)
+ add_library(mosquittopp_static STATIC
diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake index a59dd6068..3496f47b7 100644 --- a/ports/mosquitto/portfile.cmake +++ b/ports/mosquitto/portfile.cmake @@ -50,4 +50,4 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_sub${VCPKG_TARGET_EXECUTABLE_S endif() #endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/mosquitto RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file |