From 18b67ef73009374161ddfc0d3c4eb92ab4d0fa16 Mon Sep 17 00:00:00 2001 From: hank121314 Date: Sat, 16 May 2020 07:57:28 +0800 Subject: [PATCH] [paho-mqttpp3] update to 1.1 (#11327) * [paho-mqttpp3]:update to 1.1 * [paho-mqttpp3]:update to latest commit * [paho-mqttpp3]: fix static library build error * [paho-mqttpp3] (docs): add HomePage to CONTROL and (deprecated): remove include(vcpkg_common_functions) from protfile.cmake --- ports/paho-mqttpp3/CONTROL | 3 +- ports/paho-mqttpp3/fix-dependency.patch | 50 +++++++++++--- ports/paho-mqttpp3/fix-include-path.patch | 83 +++++++++++++++++------ ports/paho-mqttpp3/portfile.cmake | 6 +- 4 files changed, 107 insertions(+), 35 deletions(-) diff --git a/ports/paho-mqttpp3/CONTROL b/ports/paho-mqttpp3/CONTROL index 988f916c8..601358fcf 100644 --- a/ports/paho-mqttpp3/CONTROL +++ b/ports/paho-mqttpp3/CONTROL @@ -1,5 +1,6 @@ Source: paho-mqttpp3 -Version: 1.0.1-3 +Version: 1.1 +Homepage: https://github.com/eclipse/paho.mqtt.cpp Description: Paho project provides open-source C++ wrapper for Paho C library Build-Depends: paho-mqtt Default-Features: ssl diff --git a/ports/paho-mqttpp3/fix-dependency.patch b/ports/paho-mqttpp3/fix-dependency.patch index a0dbf445a..a19644d86 100644 --- a/ports/paho-mqttpp3/fix-dependency.patch +++ b/ports/paho-mqttpp3/fix-dependency.patch @@ -10,10 +10,11 @@ index a9f8908..5c98f3f 100644 "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" DESTINATION lib/cmake/${package_name}) diff --git a/cmake/PahoMqttCppConfig.cmake.in b/cmake/PahoMqttCppConfig.cmake.in -index e06dc68..df1cfa6 100644 +index aff9472..275655c 100644 --- a/cmake/PahoMqttCppConfig.cmake.in +++ b/cmake/PahoMqttCppConfig.cmake.in -@@ -1,6 +1,6 @@ +@@ -5,7 +5,7 @@ set(PAHO_WITH_SSL @PAHO_WITH_SSL@) + include(CMakeFindDependencyMacro) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) -find_dependency(PahoMqttC REQUIRED) @@ -22,7 +23,7 @@ index e06dc68..df1cfa6 100644 include("${CMAKE_CURRENT_LIST_DIR}/@package_name@Targets.cmake") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index bfcf6bb..089e35a 100644 +index 4e9b7c4..bd1e0a5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,7 +23,7 @@ @@ -34,21 +35,52 @@ index bfcf6bb..089e35a 100644 # --- The headers --- -@@ -91,7 +91,7 @@ if(PAHO_BUILD_SHARED) +@@ -76,17 +76,23 @@ target_include_directories(paho-cpp-objs + src + ) + +- + ## --- Build the shared library, if requested --- + + if(PAHO_BUILD_SHARED) ++ ## set PAHO_C_LIB ++ if(PAHO_WITH_SSL) ++ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3as eclipse-paho-mqtt-c::paho-mqtt3cs) ++ else() ++ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3a eclipse-paho-mqtt-c::paho-mqtt3c) ++ endif() ++ + ## create the shared library + add_library(paho-mqttpp3 SHARED $) + ## add dependencies to the shared library target_link_libraries(paho-mqttpp3 PRIVATE ${LIBS_SYSTEM} -- PUBLIC PahoMqttC::PahoMqttC) -+ PUBLIC eclipse-paho-mqtt-c::paho-mqtt3a eclipse-paho-mqtt-c::paho-mqtt3c eclipse-paho-mqtt-c::paho-mqtt3as eclipse-paho-mqtt-c::paho-mqtt3cs) +- PUBLIC PahoMqttC::PahoMqttC Threads::Threads) ++ PUBLIC ${_PAHO_MQTT_C_LIB_NAME} Threads::Threads) # It would be nice to exort the include paths from the obj lib, but we # get an export error. Perhaps in a future version? -@@ -129,7 +129,7 @@ if(PAHO_BUILD_STATIC) +@@ -118,13 +124,21 @@ endif() + ## --- Build static version of the library, if requested --- + + if(PAHO_BUILD_STATIC) ++ ++ ## set PAHO_C_LIB ++ if(PAHO_WITH_SSL) ++ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3as-static eclipse-paho-mqtt-c::paho-mqtt3cs-static) ++ else() ++ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3a-static eclipse-paho-mqtt-c::paho-mqtt3c-static) ++ endif() ++ + ## create the static library + add_library(paho-mqttpp3-static STATIC $) + ## add dependencies to the shared library target_link_libraries(paho-mqttpp3-static PRIVATE ${LIBS_SYSTEM} -- PUBLIC PahoMqttC::PahoMqttC) -+ PUBLIC eclipse-paho-mqtt-c::paho-mqtt3as-static eclipse-paho-mqtt-c::paho-mqtt3cs-static) +- PUBLIC PahoMqttC::PahoMqttC Threads::Threads) ++ PUBLIC ${_PAHO_MQTT_C_LIB_NAME} Threads::Threads) target_include_directories(paho-mqttpp3-static PUBLIC $ diff --git a/ports/paho-mqttpp3/fix-include-path.patch b/ports/paho-mqttpp3/fix-include-path.patch index 5b7297dd2..bb9800ca4 100644 --- a/ports/paho-mqttpp3/fix-include-path.patch +++ b/ports/paho-mqttpp3/fix-include-path.patch @@ -1,8 +1,8 @@ diff --git a/src/mqtt/async_client.h b/src/mqtt/async_client.h -index 2754690..019c81b 100644 +index 4bbd95c..9db5746 100644 --- a/src/mqtt/async_client.h +++ b/src/mqtt/async_client.h -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ #ifndef __mqtt_async_client_h #define __mqtt_async_client_h @@ -12,7 +12,7 @@ index 2754690..019c81b 100644 #include "mqtt/token.h" #include "mqtt/string_collection.h" diff --git a/src/mqtt/callback.h b/src/mqtt/callback.h -index 6cac442..13585de 100644 +index 434b979..2d2ee1f 100644 --- a/src/mqtt/callback.h +++ b/src/mqtt/callback.h @@ -24,7 +24,7 @@ @@ -25,7 +25,7 @@ index 6cac442..13585de 100644 #include "mqtt/types.h" #include diff --git a/src/mqtt/connect_options.h b/src/mqtt/connect_options.h -index a7cdf56..adb52fb 100644 +index 891bd01..2046b93 100644 --- a/src/mqtt/connect_options.h +++ b/src/mqtt/connect_options.h @@ -24,7 +24,7 @@ @@ -38,7 +38,7 @@ index a7cdf56..adb52fb 100644 #include "mqtt/message.h" #include "mqtt/topic.h" diff --git a/src/mqtt/delivery_token.h b/src/mqtt/delivery_token.h -index 3ecf70b..16c47bb 100644 +index b70d582..ee1b306 100644 --- a/src/mqtt/delivery_token.h +++ b/src/mqtt/delivery_token.h @@ -24,7 +24,7 @@ @@ -51,7 +51,7 @@ index 3ecf70b..16c47bb 100644 #include "mqtt/message.h" #include diff --git a/src/mqtt/disconnect_options.h b/src/mqtt/disconnect_options.h -index 81b74ad..2f8c824 100644 +index d2ebdbf..6eb3e9a 100644 --- a/src/mqtt/disconnect_options.h +++ b/src/mqtt/disconnect_options.h @@ -23,7 +23,7 @@ @@ -60,11 +60,11 @@ index 81b74ad..2f8c824 100644 -#include "MQTTAsync.h" +#include "paho-mqtt/MQTTAsync.h" + #include "mqtt/types.h" #include "mqtt/token.h" - #include - + #include "mqtt/properties.h" diff --git a/src/mqtt/exception.h b/src/mqtt/exception.h -index 775589f..77f4821 100644 +index cdcd2fc..11ddc7d 100644 --- a/src/mqtt/exception.h +++ b/src/mqtt/exception.h @@ -24,7 +24,7 @@ @@ -103,20 +103,33 @@ index 852ec8e..aa721bc 100644 #include "mqtt/buffer_view.h" #include "mqtt/string_collection.h" diff --git a/src/mqtt/message.h b/src/mqtt/message.h -index feb3b97..bdab5d8 100644 +index 5d64e8d..9f7096a 100644 --- a/src/mqtt/message.h +++ b/src/mqtt/message.h -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ #ifndef __mqtt_message_h #define __mqtt_message_h -#include "MQTTAsync.h" +#include "paho-mqtt/MQTTAsync.h" #include "mqtt/buffer_ref.h" + #include "mqtt/properties.h" #include "mqtt/exception.h" - #include +diff --git a/src/mqtt/properties.h b/src/mqtt/properties.h +index bbe977c..fa55560 100644 +--- a/src/mqtt/properties.h ++++ b/src/mqtt/properties.h +@@ -25,7 +25,7 @@ + #define __mqtt_properties_h + + extern "C" { +- #include "MQTTProperties.h" ++ #include "paho-mqtt/MQTTProperties.h" + } + + #include "mqtt/types.h" diff --git a/src/mqtt/response_options.h b/src/mqtt/response_options.h -index 6fc727f..dca2013 100644 +index 48f7831..7ec94e4 100644 --- a/src/mqtt/response_options.h +++ b/src/mqtt/response_options.h @@ -7,7 +7,7 @@ @@ -127,12 +140,25 @@ index 6fc727f..dca2013 100644 +#include "paho-mqtt/MQTTAsync.h" #include "mqtt/token.h" #include "mqtt/delivery_token.h" + #include "subscribe_options.h" +diff --git a/src/mqtt/server_response.h b/src/mqtt/server_response.h +index 7f0fe72..4d0fb2c 100644 +--- a/src/mqtt/server_response.h ++++ b/src/mqtt/server_response.h +@@ -24,7 +24,7 @@ + #ifndef __mqtt_server_response_h + #define __mqtt_server_response_h + +-#include "MQTTAsync.h" ++#include "paho-mqtt/MQTTAsync.h" + #include "mqtt/types.h" + #include "mqtt/properties.h" diff --git a/src/mqtt/ssl_options.h b/src/mqtt/ssl_options.h -index ca2f847..64a3afc 100644 +index f44607c..cdd2cdc 100644 --- a/src/mqtt/ssl_options.h +++ b/src/mqtt/ssl_options.h -@@ -25,7 +25,7 @@ +@@ -27,7 +27,7 @@ #ifndef __mqtt_ssl_options_h #define __mqtt_ssl_options_h @@ -141,11 +167,26 @@ index ca2f847..64a3afc 100644 #include "mqtt/message.h" #include "mqtt/topic.h" #include "mqtt/types.h" +diff --git a/src/mqtt/subscribe_options.h b/src/mqtt/subscribe_options.h +index 753c811..5f0d86c 100644 +--- a/src/mqtt/subscribe_options.h ++++ b/src/mqtt/subscribe_options.h +@@ -24,8 +24,8 @@ + #ifndef __mqtt_subscribe_options_h + #define __mqtt_subscribe_options_h + +-#include "MQTTAsync.h" +-#include "MQTTSubscribeOpts.h" ++#include "paho-mqtt/MQTTAsync.h" ++#include "paho-mqtt/MQTTSubscribeOpts.h" + #include "mqtt/types.h" + + namespace mqtt { diff --git a/src/mqtt/token.h b/src/mqtt/token.h -index 0db8196..e4fe10e 100644 +index efb1659..d0b2dee 100644 --- a/src/mqtt/token.h +++ b/src/mqtt/token.h -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ #ifndef __mqtt_token_h #define __mqtt_token_h @@ -155,7 +196,7 @@ index 0db8196..e4fe10e 100644 #include "mqtt/exception.h" #include "mqtt/types.h" diff --git a/src/mqtt/topic.h b/src/mqtt/topic.h -index f68005a..61e53f0 100644 +index 618eb85..555de60 100644 --- a/src/mqtt/topic.h +++ b/src/mqtt/topic.h @@ -24,7 +24,7 @@ @@ -165,13 +206,13 @@ index f68005a..61e53f0 100644 -#include "MQTTAsync.h" +#include "paho-mqtt/MQTTAsync.h" #include "mqtt/delivery_token.h" + #include "mqtt/subscribe_options.h" #include "mqtt/message.h" - #include "mqtt/types.h" diff --git a/src/mqtt/will_options.h b/src/mqtt/will_options.h -index bffb9e0..d7eca10 100644 +index a685a96..7bfc46e 100644 --- a/src/mqtt/will_options.h +++ b/src/mqtt/will_options.h -@@ -25,7 +25,7 @@ +@@ -26,7 +26,7 @@ #ifndef __mqtt_will_options_h #define __mqtt_will_options_h diff --git a/ports/paho-mqttpp3/portfile.cmake b/ports/paho-mqttpp3/portfile.cmake index ea6d57bc1..16e9acab0 100644 --- a/ports/paho-mqttpp3/portfile.cmake +++ b/ports/paho-mqttpp3/portfile.cmake @@ -1,11 +1,9 @@ -include(vcpkg_common_functions) - # Download from Github vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/paho.mqtt.cpp - REF v1.0.1 - SHA512 be612197fae387b9f1d8f10944d451ec9e7ebec6045beed365e642089c0a5fde882ed5c734f2b46a5008f98b8445a51114492f0f36fdc684b8a8fe4b71fe31a4 + REF f3a2a52259b5463ab50eee6d1c033cba18d6e84b + SHA512 9b12259e3aab347c7a362aa56d66e720532a09a44bff8671215b98c7f54bcc282a10545b529b5425eebf65e007113659364cf0e41b9c99cc938b00c1b37434d9 HEAD_REF master PATCHES fix-include-path.patch