Merge pull request #308 from embhorn/rel_v1.14.1

wolfMQTT Release v1.14.1 preparation
wolfSSL · Aug 31, 2022 · f657f8d · f657f8d
2 parents 7b5dd67 + 89dfb24
commit f657f8d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(wolfMQTT VERSION 1.14.0 LANGUAGES C)
+project(wolfMQTT VERSION 1.14.1 LANGUAGES C)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 set(MQTT_SOURCES

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 ## Release Notes
 
+### v1.14.1 (8/31/2022)
+* Fix cmake builds #307
+* Fix for Vcpkg on Windows not getting wolfssl/options.h included #305
+
 ### v1.14.0 (7/25/2022)
 * Support post-quantum KYBER_LEVEL1 and P256_KYBER_LEVEL1 with FALCON_LEVEL1 
   in wolfMQTT. by @anhu #300

diff --git a/README.md b/README.md
@@ -53,6 +53,23 @@ cmake .. -DWITH_WOLFSSL_TREE=/path/to/wolfssl/
 cmake --build .
 ```
 
+### vcpkg
+
+ You can download and install wolfMQTT using the [vcpkg](https://github.com/Microsoft/vcpkg):
+
+    git clone https://github.com/Microsoft/vcpkg.git
+    cd vcpkg
+    ./bootstrap-vcpkg.sh
+    OR for Windows
+    bootstrap-vcpkg.bat
+
+    ./vcpkg integrate install
+    ./vcpkg install wolfmqtt
+
+The wolfMQTT port in vcpkg is kept up to date by wolfSSL.
+
+We also have vcpkg ports for wolftpm, wolfssl and curl.
+
 ### Arduino
 
 See `README.md` at [IDE/ARDUINO.README.md](IDE/ARDUINO.README.md)

diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@
 # All right reserved.
 
 AC_COPYRIGHT([Copyright (C) 2014-2022 wolfSSL Inc.])
-AC_INIT([wolfmqtt],[1.14.0],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
+AC_INIT([wolfmqtt],[1.14.1],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
 
 AC_PREREQ([2.63])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -23,7 +23,7 @@ AC_ARG_PROGRAM
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([src/config.h])
 
-WOLFMQTT_LIBRARY_VERSION=13:0:0
+WOLFMQTT_LIBRARY_VERSION=13:1:0
 #                        | | |
 #                 +------+ | +---+
 #                 |        |     |

diff --git a/wolfmqtt/version.h b/wolfmqtt/version.h
@@ -34,8 +34,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFMQTT_VERSION_STRING "1.14.0"
-#define LIBWOLFMQTT_VERSION_HEX 0x01014000
+#define LIBWOLFMQTT_VERSION_STRING "1.14.1"
+#define LIBWOLFMQTT_VERSION_HEX 0x01014001
 
 #ifdef __cplusplus
 }

diff --git a/wolfmqtt/vs_settings.h b/wolfmqtt/vs_settings.h
@@ -4,9 +4,8 @@
 #ifndef _WOLFMQTT_VS_SETTINGS_
 #define _WOLFMQTT_VS_SETTINGS_
 
-/* Don't include this if using autoconf cross-compile or cmake */
-#if !defined(HAVE_CONFIG_H) && !defined(BUILDING_CMAKE)
-
+/* Don't include this if using autoconf cross-compile */
+#if !defined(HAVE_CONFIG_H)
 
 /* TLS Support */
 #undef  ENABLE_MQTT_TLS
@@ -59,7 +58,6 @@
 #undef  WOLFMQTT_NO_ERROR_STRINGS
 //#define WOLFMQTT_NO_ERROR_STRINGS
 
-
-#endif /* !HAVE_CONFIG_H && !BUILDING_CMAKE */
+#endif /* !HAVE_CONFIG_H */
 
 #endif /* _WOLFMQTT_VS_SETTINGS_ */