Fix cjson include paths.

ChangeLog.txt

@@ -1,3 +1,6 @@
+- Fix cjson include paths.
+
+
 2.0.0 - 2020-12-03
 ==================
 

apps/mosquitto_ctrl/dynsec.c

@@ -17,7 +17,7 @@ Contributors:
 */
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

apps/mosquitto_ctrl/dynsec_client.c

@@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 Contributors:
    Roger Light - initial implementation and documentation.
 */
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

apps/mosquitto_ctrl/dynsec_group.c

@@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 Contributors:
    Roger Light - initial implementation and documentation.
 */
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

apps/mosquitto_ctrl/dynsec_role.c

@@ -17,7 +17,7 @@ Contributors:
 */
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

apps/mosquitto_ctrl/example.c

@@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 Contributors:
    Roger Light - initial implementation and documentation.
 */
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

apps/mosquitto_ctrl/mosquitto_ctrl.h

@@ -18,7 +18,7 @@ Contributors:
 #ifndef MOSQUITTO_CTRL_H
 #define MOSQUITTO_CTRL_H
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdbool.h>
 
 #include "mosquitto.h"

client/sub_client_output.c

@@ -38,7 +38,7 @@ Contributors:
 #endif
 
 #ifdef WITH_CJSON
-#  include <cJSON.h>
+#  include <cjson/cJSON.h>
 #endif
 
 #ifdef __APPLE__

cmake/FindcJSON.cmake

@@ -8,11 +8,9 @@ ENDIF()
 
 FIND_PATH(
 		CJSON_INCLUDE_DIR
-		cJSON.h
+		cjson/cJSON.h
 	HINTS
 		CJSON_DIR
-		/usr/include/cjson
-		/usr/local/include/cjson
 )
 
 FIND_LIBRARY( CJSON_LIBRARY

config.h

@@ -74,7 +74,7 @@
 #endif
 
 #ifdef WITH_CJSON
-#  include <cJSON.h>
+#  include <cjson/cJSON.h>
 #  define CJSON_VERSION_FULL (CJSON_VERSION_MAJOR*1000000+CJSON_VERSION_MINOR*1000+CJSON_VERSION_PATCH)
 #endif
 

config.mk

@@ -364,7 +364,7 @@ ifeq ($(WITH_COVERAGE),yes)
 endif
 
 ifeq ($(WITH_CJSON),yes)
-	CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_CJSON -I/usr/include/cjson -I/usr/local/include/cjson
+	CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_CJSON
 	CLIENT_LDADD:=$(CLIENT_LDADD) -lcjson
 	CLIENT_STATIC_LDADD:=$(CLIENT_STATIC_LDADD) -lcjson
 	CLIENT_LDFLAGS:=$(CLIENT_LDFLAGS) -L/usr/local/lib

plugins/dynamic-security/Makefile

@@ -3,7 +3,7 @@ include ../../config.mk
 .PHONY : all binary check clean reallyclean test install uninstall
 
 PLUGIN_NAME=mosquitto_dynamic_security
-LOCAL_CPPFLAGS=-I/usr/include/cjson -I/usr/local/include/cjson -I../../src/
+LOCAL_CPPFLAGS=-I../../src/
 LOCAL_LDFLAGS=-L/usr/local/lib
 
 OBJS=	\

plugins/dynamic-security/clientlist.c

@@ -18,7 +18,7 @@ Contributors:
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <uthash.h>
 

plugins/dynamic-security/clients.c

@@ -18,7 +18,7 @@ Contributors:
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <uthash.h>
 

plugins/dynamic-security/dynamic_security.h

@@ -18,7 +18,7 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <uthash.h>
 #include "mosquitto.h"
 #include "password_mosq.h"

plugins/dynamic-security/grouplist.c

@@ -18,7 +18,7 @@ Contributors:
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <uthash.h>
 

plugins/dynamic-security/groups.c

@@ -18,7 +18,7 @@ Contributors:
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <uthash.h>
 

plugins/dynamic-security/json_help.c

@@ -18,7 +18,7 @@ Contributors:
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>

plugins/dynamic-security/json_help.h

@@ -17,7 +17,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 Contributors:
    Roger Light - initial implementation and documentation.
 */
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdbool.h>
 
 /* "optional==false" can also be taken to mean "only return success if the key exists and is valid" */

plugins/dynamic-security/plugin.c

@@ -18,7 +18,7 @@ Contributors:
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

plugins/dynamic-security/rolelist.c

@@ -18,7 +18,7 @@ Contributors:
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <string.h>
 #include <uthash.h>

plugins/dynamic-security/roles.c

@@ -18,7 +18,7 @@ Contributors:
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <string.h>
 #include <uthash.h>

snap/snapcraft.yaml

@@ -59,7 +59,7 @@ parts:
       - lws
       - cjson
     plugin: make
-    make-parameters: ["prefix=/usr", "WITH_WEBSOCKETS=yes", "WITH_ADNS=yes", "CFLAGS=-Wall -ggdb -O2 -I$SNAPCRAFT_STAGE/include -I$SNAPCRAFT_STAGE/include/cjson -D_GNU_SOURCE"]
+    make-parameters: ["prefix=/usr", "WITH_WEBSOCKETS=yes", "WITH_ADNS=yes", "CFLAGS=-Wall -ggdb -O2 -I$SNAPCRAFT_STAGE/include -D_GNU_SOURCE"]
     source: https://github.com/eclipse/mosquitto
     source-type: git