[paho-mqttpp3] update to 1.2.0 (#15573)

* [paho-mqttpp3] update to 1.1

* [paho-mqttpp3] update to 1.1

* Update version files

* revert ending line

* update version

* add vcpkg.json file

* update version

* update protifile.cmake

* Update version

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>

7 files changed, 83 insertions, 45 deletions

diff --git a/ports/paho-mqttpp3/CONTROL b/ports/paho-mqttpp3/CONTROL
deleted file mode 100644
index 346528534..000000000
--- a/ports/paho-mqttpp3/CONTROL
+++ /dev/null
@@ -1,11 +0,0 @@
-Source: paho-mqttpp3
-Version: 1.1
-Port-Version: 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
-
-Feature: ssl
-Description: Build with SSL support
-Build-Depends: openssl
diff --git a/ports/paho-mqttpp3/fix-dependency.patch b/ports/paho-mqttpp3/fix-dependency.patch
index 204bb3437..1ace8a30d 100644
--- a/ports/paho-mqttpp3/fix-dependency.patch
+++ b/ports/paho-mqttpp3/fix-dependency.patch
@@ -10,7 +10,7 @@ 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 aff9472..275655c 100644
+index 164e123..9beac1c 100644
 --- a/cmake/PahoMqttCppConfig.cmake.in
 +++ b/cmake/PahoMqttCppConfig.cmake.in
 @@ -5,7 +5,7 @@ set(PAHO_WITH_SSL @PAHO_WITH_SSL@)
@@ -20,10 +20,10 @@ index aff9472..275655c 100644
 -find_dependency(PahoMqttC REQUIRED)
 +find_dependency(eclipse-paho-mqtt-c REQUIRED)
  list(REMOVE_AT CMAKE_MODULE_PATH -1)
+ find_dependency(Threads REQUIRED)
  
- include("${CMAKE_CURRENT_LIST_DIR}/@package_name@Targets.cmake")
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4e9b7c4..93eaae9 100644
+index 3d43595..a25f74d 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -23,7 +23,7 @@
@@ -35,7 +35,7 @@ index 4e9b7c4..93eaae9 100644
  
  # --- The headers ---
  
-@@ -80,13 +80,21 @@ target_include_directories(paho-cpp-objs
+@@ -81,13 +81,21 @@ target_include_directories(paho-cpp-objs
  ## --- Build the shared library, if requested ---
  
  if(PAHO_BUILD_SHARED)
@@ -58,7 +58,7 @@ index 4e9b7c4..93eaae9 100644
  
      # It would be nice to exort the include paths from the obj lib, but we
      # get an export error. Perhaps in a future version?
-@@ -118,13 +126,22 @@ endif()
+@@ -119,13 +127,22 @@ endif()
  ## --- Build static version of the library, if requested ---
  
  if(PAHO_BUILD_STATIC)
diff --git a/ports/paho-mqttpp3/fix-include-path.patch b/ports/paho-mqttpp3/fix-include-path.patch
index bb9800ca4..17310738d 100644
--- a/ports/paho-mqttpp3/fix-include-path.patch
+++ b/ports/paho-mqttpp3/fix-include-path.patch
@@ -1,5 +1,5 @@
 diff --git a/src/mqtt/async_client.h b/src/mqtt/async_client.h

-index 4bbd95c..9db5746 100644

+index 7fb13a4..59247ca 100644

 --- a/src/mqtt/async_client.h

 +++ b/src/mqtt/async_client.h

 @@ -25,7 +25,7 @@

@@ -10,9 +10,9 @@ index 4bbd95c..9db5746 100644
 +#include "paho-mqtt/MQTTAsync.h"

  #include "mqtt/types.h"

  #include "mqtt/token.h"

- #include "mqtt/string_collection.h"

+ #include "mqtt/create_options.h"

 diff --git a/src/mqtt/callback.h b/src/mqtt/callback.h

-index 434b979..2d2ee1f 100644

+index 63f21a1..c4638fa 100644

 --- a/src/mqtt/callback.h

 +++ b/src/mqtt/callback.h

 @@ -24,7 +24,7 @@

@@ -25,7 +25,7 @@ index 434b979..2d2ee1f 100644
  #include "mqtt/types.h"

  #include <vector>

 diff --git a/src/mqtt/connect_options.h b/src/mqtt/connect_options.h

-index 891bd01..2046b93 100644

+index 8001fe3..650ba91 100644

 --- a/src/mqtt/connect_options.h

 +++ b/src/mqtt/connect_options.h

 @@ -24,7 +24,7 @@

@@ -37,6 +37,19 @@ index 891bd01..2046b93 100644
  #include "mqtt/types.h"

  #include "mqtt/message.h"

  #include "mqtt/topic.h"

+diff --git a/src/mqtt/create_options.h b/src/mqtt/create_options.h

+index d57e32b..2bb3561 100644

+--- a/src/mqtt/create_options.h

++++ b/src/mqtt/create_options.h

+@@ -24,7 +24,7 @@

+ #ifndef __mqtt_create_options_h

+ #define __mqtt_create_options_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/types.h"

+ 

+ namespace mqtt {

 diff --git a/src/mqtt/delivery_token.h b/src/mqtt/delivery_token.h

 index b70d582..ee1b306 100644

 --- a/src/mqtt/delivery_token.h

@@ -51,7 +64,7 @@ index b70d582..ee1b306 100644
  #include "mqtt/message.h"

  #include <memory>

 diff --git a/src/mqtt/disconnect_options.h b/src/mqtt/disconnect_options.h

-index d2ebdbf..6eb3e9a 100644

+index db93679..2739d89 100644

 --- a/src/mqtt/disconnect_options.h

 +++ b/src/mqtt/disconnect_options.h

 @@ -23,7 +23,7 @@

@@ -64,7 +77,7 @@ index d2ebdbf..6eb3e9a 100644
  #include "mqtt/token.h"

  #include "mqtt/properties.h"

 diff --git a/src/mqtt/exception.h b/src/mqtt/exception.h

-index cdcd2fc..11ddc7d 100644

+index 9db330a..32b7c97 100644

 --- a/src/mqtt/exception.h

 +++ b/src/mqtt/exception.h

 @@ -24,7 +24,7 @@

@@ -74,8 +87,8 @@ index cdcd2fc..11ddc7d 100644
 -#include "MQTTAsync.h"

 +#include "paho-mqtt/MQTTAsync.h"

  #include "mqtt/types.h"

+ #include <iostream>

  #include <vector>

- #include <memory>

 diff --git a/src/mqtt/iaction_listener.h b/src/mqtt/iaction_listener.h

 index 1e34577..2af8c1b 100644

 --- a/src/mqtt/iaction_listener.h

@@ -90,7 +103,7 @@ index 1e34577..2af8c1b 100644
  #include <vector>

  

 diff --git a/src/mqtt/iclient_persistence.h b/src/mqtt/iclient_persistence.h

-index 852ec8e..aa721bc 100644

+index 635a292..aedc1d9 100644

 --- a/src/mqtt/iclient_persistence.h

 +++ b/src/mqtt/iclient_persistence.h

 @@ -24,7 +24,7 @@

@@ -103,7 +116,7 @@ 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 5d64e8d..9f7096a 100644

+index 4cb95a6..e036269 100644

 --- a/src/mqtt/message.h

 +++ b/src/mqtt/message.h

 @@ -25,7 +25,7 @@

@@ -116,7 +129,7 @@ index 5d64e8d..9f7096a 100644
  #include "mqtt/properties.h"

  #include "mqtt/exception.h"

 diff --git a/src/mqtt/properties.h b/src/mqtt/properties.h

-index bbe977c..fa55560 100644

+index 826bc97..42c286a 100644

 --- a/src/mqtt/properties.h

 +++ b/src/mqtt/properties.h

 @@ -25,7 +25,7 @@

@@ -124,12 +137,12 @@ index bbe977c..fa55560 100644
  

  extern "C" {

 -	#include "MQTTProperties.h"

-+	#include "paho-mqtt/MQTTProperties.h"

++	#include "paho-mqtt/MQTTAsync.h"

  }

  

  #include "mqtt/types.h"

 diff --git a/src/mqtt/response_options.h b/src/mqtt/response_options.h

-index 48f7831..7ec94e4 100644

+index 7bcb45c..40e45a2 100644

 --- a/src/mqtt/response_options.h

 +++ b/src/mqtt/response_options.h

 @@ -7,7 +7,7 @@

@@ -142,7 +155,7 @@ index 48f7831..7ec94e4 100644
  #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

+index a111839..094135b 100644

 --- a/src/mqtt/server_response.h

 +++ b/src/mqtt/server_response.h

 @@ -24,7 +24,7 @@

@@ -155,7 +168,7 @@ index 7f0fe72..4d0fb2c 100644
  #include "mqtt/properties.h"

  

 diff --git a/src/mqtt/ssl_options.h b/src/mqtt/ssl_options.h

-index f44607c..cdd2cdc 100644

+index eba49ed..aad0da3 100644

 --- a/src/mqtt/ssl_options.h

 +++ b/src/mqtt/ssl_options.h

 @@ -27,7 +27,7 @@

@@ -167,6 +180,19 @@ index f44607c..cdd2cdc 100644
  #include "mqtt/message.h"

  #include "mqtt/topic.h"

  #include "mqtt/types.h"

+diff --git a/src/mqtt/string_collection.h b/src/mqtt/string_collection.h

+index bc43775..99a2674 100644

+--- a/src/mqtt/string_collection.h

++++ b/src/mqtt/string_collection.h

+@@ -24,7 +24,7 @@

+ #ifndef __mqtt_string_collection_h

+ #define __mqtt_string_collection_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/types.h"

+ #include <vector>

+ #include <map>

 diff --git a/src/mqtt/subscribe_options.h b/src/mqtt/subscribe_options.h

 index 753c811..5f0d86c 100644

 --- a/src/mqtt/subscribe_options.h

@@ -183,7 +209,7 @@ index 753c811..5f0d86c 100644
  

  namespace mqtt {

 diff --git a/src/mqtt/token.h b/src/mqtt/token.h

-index efb1659..d0b2dee 100644

+index 4cafda7..1815ab9 100644

 --- a/src/mqtt/token.h

 +++ b/src/mqtt/token.h

 @@ -25,7 +25,7 @@

@@ -209,7 +235,7 @@ index 618eb85..555de60 100644
  #include "mqtt/subscribe_options.h"

  #include "mqtt/message.h"

 diff --git a/src/mqtt/will_options.h b/src/mqtt/will_options.h

-index a685a96..7bfc46e 100644

+index 8c5c67d..63bfffc 100644

 --- a/src/mqtt/will_options.h

 +++ b/src/mqtt/will_options.h

 @@ -26,7 +26,7 @@

diff --git a/ports/paho-mqttpp3/portfile.cmake b/ports/paho-mqttpp3/portfile.cmake
index 16e9acab0..7926d0d73 100644
--- a/ports/paho-mqttpp3/portfile.cmake
+++ b/ports/paho-mqttpp3/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO eclipse/paho.mqtt.cpp
-  REF f3a2a52259b5463ab50eee6d1c033cba18d6e84b
-  SHA512 9b12259e3aab347c7a362aa56d66e720532a09a44bff8671215b98c7f54bcc282a10545b529b5425eebf65e007113659364cf0e41b9c99cc938b00c1b37434d9
+  REF 33921c8b68b351828650c36816e7ecf936764379 #v1.2.0
+  SHA512 3f4a91987e0106e50e637d8d4fb13a4f8aca14eea168102664fdcebd1260609434e679f5986a1c4d71746735530f1b72fc29d2ac05cb35b3ce734a6aab1a0a55
   HEAD_REF master
   PATCHES
     fix-include-path.patch
@@ -11,7 +11,8 @@ vcpkg_from_github(
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS 
-  "ssl" PAHO_WITH_SSL
+  FEATURES
+    "ssl" PAHO_WITH_SSL
 )
 
 # Link with 'paho-mqtt3as' library
@@ -27,8 +28,6 @@ endif()
 # Setting the include path where MqttClient.h is present
 set(PAHO_C_INC "${CURRENT_INSTALLED_DIR}/include")
 
-# Set the generator to Ninja
-set(PAHO_CMAKE_GENERATOR "Ninja")
 
 # NOTE: the Paho C++ cmake files on Github are problematic. 
 # It uses two different options PAHO_BUILD_STATIC and PAHO_BUILD_SHARED instead of just using one variable.
@@ -47,13 +46,12 @@ endif()
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
-  GENERATOR ${PAHO_CMAKE_GENERATOR}
   OPTIONS
-  -DPAHO_BUILD_STATIC=${PAHO_MQTTPP3_STATIC}
-  -DPAHO_BUILD_SHARED=${PAHO_MQTTPP3_SHARED}
-  -DPAHO_MQTT_C_INCLUDE_DIRS=${PAHO_C_INC}
-  ${FEATURE_OPTIONS}
-  ${PAHO_OPTIONS}
+    -DPAHO_BUILD_STATIC=${PAHO_MQTTPP3_STATIC}
+    -DPAHO_BUILD_SHARED=${PAHO_MQTTPP3_SHARED}
+    -DPAHO_MQTT_C_INCLUDE_DIRS=${PAHO_C_INC}
+    ${FEATURE_OPTIONS}
+    ${PAHO_OPTIONS}
 )
 
 # Run the build, copy pdbs and fixup the cmake targets
diff --git a/ports/paho-mqttpp3/vcpkg.json b/ports/paho-mqttpp3/vcpkg.json
new file mode 100644
index 000000000..b4152d708
--- /dev/null
+++ b/ports/paho-mqttpp3/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "paho-mqttpp3",
+  "version": "1.2.0",
+  "description": "Paho project provides open-source C++ wrapper for Paho C library",
+  "homepage": "https://github.com/eclipse/paho.mqtt.cpp",
+  "dependencies": [
+    "paho-mqtt"
+  ],
+  "default-features": [
+    "ssl"
+  ],
+  "features": {
+    "ssl": {
+      "description": "Build with SSL support",
+      "dependencies": [
+        "openssl"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 173d9601a..788ce57d5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4601,8 +4601,8 @@
       "port-version": 0
     },
     "paho-mqttpp3": {
-      "baseline": "1.1",
-      "port-version": 1
+      "baseline": "1.2.0",
+      "port-version": 0
     },
     "palsigslot": {
       "baseline": "1.2.0",
diff --git a/versions/p-/paho-mqttpp3.json b/versions/p-/paho-mqttpp3.json
index c3b6235a6..9312ab4a2 100644
--- a/versions/p-/paho-mqttpp3.json
+++ b/versions/p-/paho-mqttpp3.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "850cb4a6ccac89062c16dd783ad0631215c1a94b",
+      "version": "1.2.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "93fd209433fc93b89946d48f958947c7e7fbb219",
       "version-string": "1.1",
       "port-version": 1