eclipse/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse/mosquitto.git synced 2025-05-08 16:52:13 +08:00
Code Issues Releases Wiki Activity

Fix cjson include paths.

Browse Source
This commit is contained in:
Roger A. Light 2020-12-04 22:15:19 +00:00
parent 5679a4d432
commit 791c63372b
23 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.txt
View File

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

2
apps/mosquitto_ctrl/dynsec.c
View File

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

2
apps/mosquitto_ctrl/dynsec_client.c
View File

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

2
apps/mosquitto_ctrl/dynsec_group.c
View File

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

2
apps/mosquitto_ctrl/dynsec_role.c
View File

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

2
apps/mosquitto_ctrl/example.c
View File

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

2
apps/mosquitto_ctrl/mosquitto_ctrl.h
View File

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

2
client/sub_client_output.c
View File

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

4
cmake/FindcJSON.cmake
View File

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

2
config.h
View File

@ -74,7 +74,7 @@
#endif #endif
#ifdef WITH_CJSON #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) # define CJSON_VERSION_FULL (CJSON_VERSION_MAJOR*1000000+CJSON_VERSION_MINOR*1000+CJSON_VERSION_PATCH)
#endif #endif

2
config.mk
View File

@ -364,7 +364,7 @@ ifeq ($(WITH_COVERAGE),yes)
endif endif
ifeq ($(WITH_CJSON),yes) 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_LDADD:=$(CLIENT_LDADD) -lcjson
CLIENT_STATIC_LDADD:=$(CLIENT_STATIC_LDADD) -lcjson CLIENT_STATIC_LDADD:=$(CLIENT_STATIC_LDADD) -lcjson
CLIENT_LDFLAGS:=$(CLIENT_LDFLAGS) -L/usr/local/lib CLIENT_LDFLAGS:=$(CLIENT_LDFLAGS) -L/usr/local/lib

2
plugins/dynamic-security/Makefile
View File

@ -3,7 +3,7 @@ include ../../config.mk
.PHONY : all binary check clean reallyclean test install uninstall .PHONY : all binary check clean reallyclean test install uninstall
PLUGIN_NAME=mosquitto_dynamic_security 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 LOCAL_LDFLAGS=-L/usr/local/lib
OBJS= \ OBJS= \

2
plugins/dynamic-security/clientlist.c
View File

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

2
plugins/dynamic-security/clients.c
View File

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

2
plugins/dynamic-security/dynamic_security.h
View File

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

2
plugins/dynamic-security/grouplist.c
View File

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

2
plugins/dynamic-security/groups.c
View File

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

2
plugins/dynamic-security/json_help.c
View File

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

2
plugins/dynamic-security/json_help.h
View File

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

2
plugins/dynamic-security/plugin.c
View File

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

2
plugins/dynamic-security/rolelist.c
View File

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

2
plugins/dynamic-security/roles.c
View File

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

2
snap/snapcraft.yaml
View File

@ -59,7 +59,7 @@ parts:
- lws - lws
- cjson - cjson
plugin: make 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: https://github.com/eclipse/mosquitto
source-type: git source-type: git