[paho-mqtt] Upgraded to Paho-MQTT v1.21 (#3620)

microsoft · Jul 4, 2018 · fcee4c8 · fcee4c8
1 parent 88b03d1
commit fcee4c8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 28 deletions.
diff --git a/ports/paho-mqtt/CONTROL b/ports/paho-mqtt/CONTROL
@@ -1,4 +1,4 @@
 Source: paho-mqtt
-Version: 1.2.0-3
+Version: 1.2.1
 Description: Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things
 Build-Depends: openssl
diff --git a/ports/paho-mqtt/disable_tests.patch b/ports/paho-mqtt/disable_tests.patch
diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO eclipse/paho.mqtt.c
-  REF v1.2.0
-  SHA512 ffad01a8f9f41049dd008e163136e4ecb8c7c51f7b49917201593b0844b15a8d2a413ddec06fa5b2d77e432f0603b71664a23afbb7c215121cebd7d419ccacfa
+  REF v1.2.1
+  SHA512 98828852ecd127445591df31416adaebebd30848c027361ae62af6b14b84e3cf2a4b90cab692b983148cbf93f710a9e2dd722a3da8c4fd17eb2149e4227a8860
   HEAD_REF master
 )
 
@@ -14,15 +14,14 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC)
 vcpkg_apply_patches(
   SOURCE_PATH ${SOURCE_PATH}
   PATCHES
-  "${CMAKE_CURRENT_LIST_DIR}/disable_tests.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/remove_compiler_options.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/remove_compiler_options.patch"
 )
 
 
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
-  OPTIONS -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_STATIC=${PAHO_BUILD_STATIC}
+  OPTIONS -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_STATIC=${PAHO_BUILD_STATIC} -DPAHO_ENABLE_TESTING=FALSE
 )
 
 

diff --git a/ports/paho-mqtt/remove_compiler_options.patch b/ports/paho-mqtt/remove_compiler_options.patch
@@ -1,9 +1,9 @@
-diff --git "a/CMakeLists.txt" "b/CMakeLists.txt"
-index 2feb580..796d08e 100644
---- "a/CMakeLists.txt"
-+++ "b/CMakeLists.txt"
-@@ -55,7 +55,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
- ENDIF()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index be8d2e8..418e2f2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,7 +37,7 @@ STRING(TIMESTAMP BUILD_TIMESTAMP UTC)
+ MESSAGE(STATUS "Timestamp is ${BUILD_TIMESTAMP}")
 
  IF(WIN32)
 -  ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN -MD)