From 550c54701ee5120668e5e5491c582b921f562b5d Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Wed, 2 Dec 2020 15:49:39 +0000
Subject: [PATCH] Fix cmake build when cjson not available.

---
 CMakeLists.txt                          | 1 -
 apps/mosquitto_ctrl/CMakeLists.txt      | 1 +
 client/CMakeLists.txt                   | 1 +
 plugins/dynamic-security/CMakeLists.txt | 2 ++
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d569513..5ead8a80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,6 @@ endif (WITH_DLT)
 FIND_PACKAGE(cJSON)
 if (CJSON_FOUND)
 	message(STATUS ${CJSON_FOUND})
-	add_definitions("-DWITH_CJSON")
 else (CJSON_FOUND)
 	message(STATUS "Optional dependency cJSON not found. Some features will be disabled.")
 endif(CJSON_FOUND)
diff --git a/apps/mosquitto_ctrl/CMakeLists.txt b/apps/mosquitto_ctrl/CMakeLists.txt
index f2708ff3..581676ba 100644
--- a/apps/mosquitto_ctrl/CMakeLists.txt
+++ b/apps/mosquitto_ctrl/CMakeLists.txt
@@ -1,4 +1,5 @@
 if (WITH_TLS AND CJSON_FOUND)
+	add_definitions("-DWITH_CJSON")
 
 	include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include
 			${mosquitto_SOURCE_DIR}/lib ${mosquitto_SOURCE_DIR}/src
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 62dfd3c8..38178c3e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -11,6 +11,7 @@ set( CLIENT_INC ${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include
 set( CLIENT_DIR ${mosquitto_BINARY_DIR}/lib)
 
 if (CJSON_FOUND)
+	add_definitions("-DWITH_CJSON")
 	set( CLIENT_DIR "${CLIENT_DIR} ${CJSON_DIR}" )
 	set( CLIENT_INC "${CLIENT_INC};${CJSON_INCLUDE_DIRS}" )
 endif()
diff --git a/plugins/dynamic-security/CMakeLists.txt b/plugins/dynamic-security/CMakeLists.txt
index ef7ff1a7..976c1345 100644
--- a/plugins/dynamic-security/CMakeLists.txt
+++ b/plugins/dynamic-security/CMakeLists.txt
@@ -1,4 +1,6 @@
 if (CJSON_FOUND AND WITH_TLS)
+	add_definitions("-DWITH_CJSON")
+
 	set( CLIENT_INC ${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include
 		${STDBOOL_H_PATH} ${STDINT_H_PATH} ${PTHREAD_INCLUDE_DIR}
 		${OPENSSL_INCLUDE_DIR} ${mosquitto_SOURCE_DIR}/deps