Fix Zephyr example.

wolfSSL · May 6, 2024 · 60350f3 · 60350f3
1 parent 06a7812
commit 60350f3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
@@ -5,4 +5,10 @@ if(CONFIG_WOLFMQTT)
   FILE(GLOB wolfmqtt_sources ${ZEPHYR_CURRENT_MODULE_DIR}/src/*.c)
   target_sources(app PRIVATE ${wolfmqtt_sources})
   add_definitions(-DWOLFMQTT_ZEPHYR)
+
+  if(CONFIG_WOLFMQTT_SETTINGS_FILE)
+      target_compile_definitions(wolfmqtt INTERFACE
+        WOLFMQTT_SETTINGS_FILE="${CONFIG_WOLFMQTT_SETTINGS_FILE}"
+      )
+    endif()
 endif()
diff --git a/zephyr/samples/client/user_settings.h b/zephyr/samples/client/user_settings.h
@@ -5,6 +5,11 @@
 extern "C" {
 #endif
 
+/* If a custom user_settings file is provided use it instead */
+#ifdef WOLFMQTT_SETTINGS_FILE
+#include WOLFMQTT_SETTINGS_FILE
+#endif
+
 #undef NO_FILESYSTEM
 #define NO_FILESYSTEM
 

diff --git a/zephyr/samples/client_tls/user_settings.h b/zephyr/samples/client_tls/user_settings.h
@@ -5,8 +5,9 @@
 extern "C" {
 #endif
 
-#ifdef CONFIG_WOLFSSL_SETTINGS_FILE
-#include CONFIG_WOLFSSL_SETTINGS_FILE
+/* If a custom user_settings file is provided use it instead */
+#ifdef WOLFMQTT_SETTINGS_FILE
+#include WOLFMQTT_SETTINGS_FILE
 #endif
 
 #undef NO_FILESYSTEM