From dbd0d6f0d8b9f2e8eedc0c89cac13aeba462eafe Mon Sep 17 00:00:00 2001
From: Roger Light <roger@atchoo.org>
Date: Tue, 28 Sep 2021 11:48:03 +0100
Subject: [PATCH] CMake build fixes.

---
 apps/mosquitto_ctrl/CMakeLists.txt           | 5 +++++
 client/CMakeLists.txt                        | 5 +++++
 plugins/dynamic-security/CMakeLists.txt      | 5 +++++
 plugins/examples/delayed-auth/CMakeLists.txt | 6 ++++++
 src/loop.c                                   | 2 ++
 5 files changed, 23 insertions(+)

diff --git a/apps/mosquitto_ctrl/CMakeLists.txt b/apps/mosquitto_ctrl/CMakeLists.txt
index c0c16298..217ede89 100644
--- a/apps/mosquitto_ctrl/CMakeLists.txt
+++ b/apps/mosquitto_ctrl/CMakeLists.txt
@@ -31,6 +31,11 @@ if(WITH_TLS AND CJSON_FOUND)
 		"${mosquitto_SOURCE_DIR}/plugins/dynamic-security"
 		"${mosquitto_SOURCE_DIR}/src"
 	)
+	if(WITH_BUNDLED_DEPS)
+		target_include_directories(mosquitto_ctrl PRIVATE
+			"${mosquitto_SOURCE_DIR}/deps"
+		)
+	endif()
 
 	if(WITH_STATIC_LIBRARIES)
 		target_link_libraries(mosquitto_ctrl libmosquitto_static)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index d7be8963..c949998f 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -29,6 +29,11 @@ target_include_directories(mosquitto_pub PRIVATE ${CLIENT_INC})
 target_include_directories(mosquitto_sub PRIVATE ${CLIENT_INC})
 target_include_directories(mosquitto_rr PRIVATE ${CLIENT_INC})
 
+if(WITH_BUNDLED_DEPS)
+	target_include_directories(mosquitto_sub PRIVATE "${mosquitto_SOURCE_DIR}/deps")
+	target_include_directories(mosquitto_rr PRIVATE "${mosquitto_SOURCE_DIR}/deps")
+endif()
+
 link_directories(${CLIENT_DIR})
 
 
diff --git a/plugins/dynamic-security/CMakeLists.txt b/plugins/dynamic-security/CMakeLists.txt
index 2f99a204..a08ac64f 100644
--- a/plugins/dynamic-security/CMakeLists.txt
+++ b/plugins/dynamic-security/CMakeLists.txt
@@ -38,6 +38,11 @@ if(CJSON_FOUND AND WITH_TLS)
 	target_include_directories(mosquitto_dynamic_security PRIVATE
 		${CLIENT_INC}
 	)
+	if(WITH_BUNDLED_DEPS)
+		target_include_directories(mosquitto_dynamic_security PRIVATE
+			"${mosquitto_SOURCE_DIR}/deps"
+		)
+	endif()
 	link_directories(${CLIENT_DIR} "${mosquitto_SOURCE_DIR}")
 
 	set_target_properties(mosquitto_dynamic_security PROPERTIES
diff --git a/plugins/examples/delayed-auth/CMakeLists.txt b/plugins/examples/delayed-auth/CMakeLists.txt
index 77a9d892..2da0a20f 100644
--- a/plugins/examples/delayed-auth/CMakeLists.txt
+++ b/plugins/examples/delayed-auth/CMakeLists.txt
@@ -9,6 +9,12 @@ target_include_directories(mosquitto_delayed_auth PRIVATE
 	"${mosquitto_SOURCE_DIR}/include"
 )
 
+if(WITH_BUNDLED_DEPS)
+	target_include_directories(mosquitto_delayed_auth PRIVATE
+		"${mosquitto_SOURCE_DIR}/deps"
+	)
+endif()
+
 set_target_properties(mosquitto_delayed_auth PROPERTIES
 	PREFIX ""
 	POSITION_INDEPENDENT_CODE 1
diff --git a/src/loop.c b/src/loop.c
index faa91f80..443d9924 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -235,7 +235,9 @@ int mosquitto_main_loop(struct mosquitto__listener_sock *listensock, int listens
 			mosquitto_security_apply();
 			log__close(db.config);
 			log__init(db.config);
+#ifdef WITH_CJSON
 			broker_control__reload();
+#endif
 #ifdef WITH_BRIDGE
 			bridge__reload();
 #endif