From 791c63372b1e0a8818845a22c54a555843e06891 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Fri, 4 Dec 2020 22:15:19 +0000 Subject: [PATCH] Fix cjson include paths. --- ChangeLog.txt | 3 +++ apps/mosquitto_ctrl/dynsec.c | 2 +- apps/mosquitto_ctrl/dynsec_client.c | 2 +- apps/mosquitto_ctrl/dynsec_group.c | 2 +- apps/mosquitto_ctrl/dynsec_role.c | 2 +- apps/mosquitto_ctrl/example.c | 2 +- apps/mosquitto_ctrl/mosquitto_ctrl.h | 2 +- client/sub_client_output.c | 2 +- cmake/FindcJSON.cmake | 4 +--- config.h | 2 +- config.mk | 2 +- plugins/dynamic-security/Makefile | 2 +- plugins/dynamic-security/clientlist.c | 2 +- plugins/dynamic-security/clients.c | 2 +- plugins/dynamic-security/dynamic_security.h | 2 +- plugins/dynamic-security/grouplist.c | 2 +- plugins/dynamic-security/groups.c | 2 +- plugins/dynamic-security/json_help.c | 2 +- plugins/dynamic-security/json_help.h | 2 +- plugins/dynamic-security/plugin.c | 2 +- plugins/dynamic-security/rolelist.c | 2 +- plugins/dynamic-security/roles.c | 2 +- snap/snapcraft.yaml | 2 +- 23 files changed, 25 insertions(+), 24 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 240f4a80..030ea8c5 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,6 @@ +- Fix cjson include paths. + + 2.0.0 - 2020-12-03 ================== diff --git a/apps/mosquitto_ctrl/dynsec.c b/apps/mosquitto_ctrl/dynsec.c index 96aae993..35d29e9d 100644 --- a/apps/mosquitto_ctrl/dynsec.c +++ b/apps/mosquitto_ctrl/dynsec.c @@ -17,7 +17,7 @@ Contributors: */ #include "config.h" -#include +#include #include #include #include diff --git a/apps/mosquitto_ctrl/dynsec_client.c b/apps/mosquitto_ctrl/dynsec_client.c index 1dea7862..45b6d6af 100644 --- a/apps/mosquitto_ctrl/dynsec_client.c +++ b/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 +#include #include #include #include diff --git a/apps/mosquitto_ctrl/dynsec_group.c b/apps/mosquitto_ctrl/dynsec_group.c index b0faf27b..4b5ceca5 100644 --- a/apps/mosquitto_ctrl/dynsec_group.c +++ b/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 +#include #include #include #include diff --git a/apps/mosquitto_ctrl/dynsec_role.c b/apps/mosquitto_ctrl/dynsec_role.c index 10b26efa..2bc5a03d 100644 --- a/apps/mosquitto_ctrl/dynsec_role.c +++ b/apps/mosquitto_ctrl/dynsec_role.c @@ -17,7 +17,7 @@ Contributors: */ #include "config.h" -#include +#include #include #include #include diff --git a/apps/mosquitto_ctrl/example.c b/apps/mosquitto_ctrl/example.c index 63ba3eb0..1027fb60 100644 --- a/apps/mosquitto_ctrl/example.c +++ b/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 +#include #include #include #include diff --git a/apps/mosquitto_ctrl/mosquitto_ctrl.h b/apps/mosquitto_ctrl/mosquitto_ctrl.h index 52bbc9a8..0c9c931a 100644 --- a/apps/mosquitto_ctrl/mosquitto_ctrl.h +++ b/apps/mosquitto_ctrl/mosquitto_ctrl.h @@ -18,7 +18,7 @@ Contributors: #ifndef MOSQUITTO_CTRL_H #define MOSQUITTO_CTRL_H -#include +#include #include #include "mosquitto.h" diff --git a/client/sub_client_output.c b/client/sub_client_output.c index 167071f8..a70d59ec 100644 --- a/client/sub_client_output.c +++ b/client/sub_client_output.c @@ -38,7 +38,7 @@ Contributors: #endif #ifdef WITH_CJSON -# include +# include #endif #ifdef __APPLE__ diff --git a/cmake/FindcJSON.cmake b/cmake/FindcJSON.cmake index 60a65c69..1b1455d0 100644 --- a/cmake/FindcJSON.cmake +++ b/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 diff --git a/config.h b/config.h index 77da39df..bdce7469 100644 --- a/config.h +++ b/config.h @@ -74,7 +74,7 @@ #endif #ifdef WITH_CJSON -# include +# include # define CJSON_VERSION_FULL (CJSON_VERSION_MAJOR*1000000+CJSON_VERSION_MINOR*1000+CJSON_VERSION_PATCH) #endif diff --git a/config.mk b/config.mk index 3e0c3240..e8be1aa1 100644 --- a/config.mk +++ b/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 diff --git a/plugins/dynamic-security/Makefile b/plugins/dynamic-security/Makefile index 6fc50edd..559f531e 100644 --- a/plugins/dynamic-security/Makefile +++ b/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= \ diff --git a/plugins/dynamic-security/clientlist.c b/plugins/dynamic-security/clientlist.c index 97957e07..d362a9b8 100644 --- a/plugins/dynamic-security/clientlist.c +++ b/plugins/dynamic-security/clientlist.c @@ -18,7 +18,7 @@ Contributors: #include "config.h" -#include +#include #include #include diff --git a/plugins/dynamic-security/clients.c b/plugins/dynamic-security/clients.c index 5ae03b47..50a0922e 100644 --- a/plugins/dynamic-security/clients.c +++ b/plugins/dynamic-security/clients.c @@ -18,7 +18,7 @@ Contributors: #include "config.h" -#include +#include #include #include diff --git a/plugins/dynamic-security/dynamic_security.h b/plugins/dynamic-security/dynamic_security.h index fcf39579..57c814b8 100644 --- a/plugins/dynamic-security/dynamic_security.h +++ b/plugins/dynamic-security/dynamic_security.h @@ -18,7 +18,7 @@ Contributors: Roger Light - initial implementation and documentation. */ -#include +#include #include #include "mosquitto.h" #include "password_mosq.h" diff --git a/plugins/dynamic-security/grouplist.c b/plugins/dynamic-security/grouplist.c index 85df7199..afdc0186 100644 --- a/plugins/dynamic-security/grouplist.c +++ b/plugins/dynamic-security/grouplist.c @@ -18,7 +18,7 @@ Contributors: #include "config.h" -#include +#include #include #include diff --git a/plugins/dynamic-security/groups.c b/plugins/dynamic-security/groups.c index 5157113a..144b3244 100644 --- a/plugins/dynamic-security/groups.c +++ b/plugins/dynamic-security/groups.c @@ -18,7 +18,7 @@ Contributors: #include "config.h" -#include +#include #include #include diff --git a/plugins/dynamic-security/json_help.c b/plugins/dynamic-security/json_help.c index 04e5b3cf..dd8379c9 100644 --- a/plugins/dynamic-security/json_help.c +++ b/plugins/dynamic-security/json_help.c @@ -18,7 +18,7 @@ Contributors: #include "config.h" -#include +#include #include #include #include diff --git a/plugins/dynamic-security/json_help.h b/plugins/dynamic-security/json_help.h index f80f1447..b1b6aed0 100644 --- a/plugins/dynamic-security/json_help.h +++ b/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 +#include #include /* "optional==false" can also be taken to mean "only return success if the key exists and is valid" */ diff --git a/plugins/dynamic-security/plugin.c b/plugins/dynamic-security/plugin.c index 76aae115..c41e498c 100644 --- a/plugins/dynamic-security/plugin.c +++ b/plugins/dynamic-security/plugin.c @@ -18,7 +18,7 @@ Contributors: #include "config.h" -#include +#include #include #include #include diff --git a/plugins/dynamic-security/rolelist.c b/plugins/dynamic-security/rolelist.c index f2c4cda2..6df19d21 100644 --- a/plugins/dynamic-security/rolelist.c +++ b/plugins/dynamic-security/rolelist.c @@ -18,7 +18,7 @@ Contributors: #include "config.h" -#include +#include #include #include #include diff --git a/plugins/dynamic-security/roles.c b/plugins/dynamic-security/roles.c index 7b33bdc0..635ddefd 100644 --- a/plugins/dynamic-security/roles.c +++ b/plugins/dynamic-security/roles.c @@ -18,7 +18,7 @@ Contributors: #include "config.h" -#include +#include #include #include #include diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 3157a6e3..90c38760 100644 --- a/snap/snapcraft.yaml +++ b/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