Add imported target for cJSON

Signed-off-by: Kai Buschulte <kai.buschulte@cedalo.com>

CMakeLists.txt

@@ -90,7 +90,7 @@ if(WITH_CJSON)
 	FIND_PACKAGE(cJSON)
 	if(CJSON_FOUND)
 		message(STATUS ${CJSON_FOUND})
-		add_definitions(-DWITH_CJSON)
+		target_compile_definitions(cJSON INTERFACE WITH_CJSON)
 	else()
 		message(STATUS "Optional dependency cJSON not found. Some features will be disabled.")
 	endif()

apps/mosquitto_ctrl/CMakeLists.txt

@@ -1,8 +1,4 @@
 if(WITH_TLS AND CJSON_FOUND)
-	add_definitions("-DWITH_CJSON")
-
-	link_directories(${CJSON_DIR})
-
 	add_executable(mosquitto_ctrl
 		mosquitto_ctrl.c mosquitto_ctrl.h
 		../../common/base64_mosq.c ../../common/base64_mosq.h
@@ -21,7 +17,6 @@ if(WITH_TLS AND CJSON_FOUND)
 	)
 
 	target_include_directories(mosquitto_ctrl PRIVATE
-		"${CJSON_INCLUDE_DIRS}"
 		"${OPENSSL_INCLUDE_DIR}"
 		"${STDBOOL_H_PATH}"
 		"${STDINT_H_PATH}"
@@ -63,7 +58,7 @@ if(WITH_TLS AND CJSON_FOUND)
 	target_link_libraries(mosquitto_ctrl
 	  PRIVATE
 		${OPENSSL_LIBRARIES}
-		${CJSON_LIBRARIES}
+		cJSON
 	)
 
 	if (WITH_THREADING AND NOT WIN32)

client/CMakeLists.txt

@@ -12,14 +12,6 @@ set(CLIENT_INC
 	"${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()
-
 if(WITH_WEBSOCKETS AND WITH_WEBSOCKETS_BUILTIN)
 	add_definitions("-DWITH_WEBSOCKETS=WS_IS_BUILTIN")
 endif()
@@ -46,13 +38,10 @@ if(WITH_BUNDLED_DEPS)
 	target_include_directories(mosquitto_rr PRIVATE "${mosquitto_SOURCE_DIR}/deps")
 endif()
 
-link_directories(${CLIENT_DIR})
-
-
 if(CJSON_FOUND)
-	target_link_libraries(mosquitto_pub PRIVATE ${CJSON_LIBRARIES})
-	target_link_libraries(mosquitto_sub PRIVATE ${CJSON_LIBRARIES})
-	target_link_libraries(mosquitto_rr PRIVATE ${CJSON_LIBRARIES})
+	target_link_libraries(mosquitto_pub PRIVATE cJSON)
+	target_link_libraries(mosquitto_sub PRIVATE cJSON)
+	target_link_libraries(mosquitto_rr PRIVATE cJSON)
 endif()
 
 if(WITH_STATIC_LIBRARIES)

cmake/FindcJSON.cmake

@@ -31,6 +31,17 @@ IF( CJSON_FOUND )
 		CJSON_INCLUDE_DIR
 		CJSON_DIR
 	)
+
+	add_library(cJSON SHARED IMPORTED)
+	set_target_properties(cJSON
+		PROPERTIES
+			INTERFACE_INCLUDE_DIRECTORIES "${CJSON_INCLUDE_DIRS}"
+	)
+
+	set_target_properties(cJSON
+		PROPERTIES
+			IMPORTED_LOCATION "${CJSON_LIBRARY}"
+	)
 ELSE()
 	SET( CJSON_DIR "" CACHE STRING
 		"An optional hint to a directory for finding `cJSON`"

plugins/dynamic-security/CMakeLists.txt

@@ -1,9 +1,6 @@
 if(CJSON_FOUND AND WITH_TLS)
-	add_definitions("-DWITH_CJSON")
-
 	set(CLIENT_INC
 		"${CJSON_INCLUDE_DIRS}"
-		"${OPENSSL_INCLUDE_DIR}"
 		"${STDBOOL_H_PATH}"
 		"${STDINT_H_PATH}"
 		"${mosquitto_SOURCE_DIR}"
@@ -57,7 +54,11 @@ if(CJSON_FOUND AND WITH_TLS)
 		POSITION_INDEPENDENT_CODE 1
 	)
 
-	target_link_libraries(mosquitto_dynamic_security PRIVATE ${CJSON_LIBRARIES} ${OPENSSL_LIBRARIES})
+	target_link_libraries(mosquitto_dynamic_security
+		PRIVATE
+			cJSON
+			OpenSSL::SSL
+	)
 	if(WIN32)
 		target_link_libraries(mosquitto_dynamic_security PRIVATE mosquitto)
 		install(TARGETS mosquitto_dynamic_security

plugins/persist-sqlite/CMakeLists.txt

@@ -1,5 +1,4 @@
 if(SQLITE3_FOUND AND CJSON_FOUND)
-	add_definitions("-DWITH_CJSON")
 	set(CLIENT_INC
 		"${SQLITE3_INCLUDE_DIRS}"
 		"${STDBOOL_H_PATH}"
@@ -34,7 +33,11 @@ if(SQLITE3_FOUND AND CJSON_FOUND)
 		POSITION_INDEPENDENT_CODE 1
 	)
 
-	target_link_libraries(mosquitto_persist_sqlite PRIVATE ${SQLITE3_LIBRARIES})
+	target_link_libraries(mosquitto_persist_sqlite
+		PRIVATE
+			${SQLITE3_LIBRARIES}
+			cJSON
+	)
 	if(WIN32)
 		target_link_libraries(mosquitto_persist_sqlite PRIVATE mosquitto)
 	endif()

src/CMakeLists.txt

@@ -219,7 +219,7 @@ if(WITH_WEBSOCKETS)
 endif()
 
 if(CJSON_FOUND)
-	set (MOSQ_LIBS ${MOSQ_LIBS} cjson)
+	target_link_libraries(mosquitto PRIVATE cJSON)
 endif()
 
 target_include_directories(mosquitto PRIVATE