d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cmake build when cjson not available.

Browse Source
This commit is contained in:
Roger A. Light 2020-12-02 15:49:39 +00:00
parent 8f0bdd5fd3
commit 550c54701e
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -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)

1
apps/mosquitto_ctrl/CMakeLists.txt
View File

@ -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

1
client/CMakeLists.txt
View File

@ -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()

2
plugins/dynamic-security/CMakeLists.txt
View File

@ -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