Fix cmake build when cjson not available.

eclipse · Dec 2, 2020 · 550c547 · 550c547
1 parent 8f0bdd5
commit 550c547
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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