Fix cjson include paths.

eclipse · Dec 4, 2020 · 791c633 · 791c633
1 parent 5679a4d
commit 791c633
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 24 deletions.
diff --git 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
@@ -17,7 +17,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 */
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git 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 <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git 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 <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/apps/mosquitto_ctrl/dynsec_role.c b/apps/mosquitto_ctrl/dynsec_role.c
@@ -17,7 +17,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 */
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git 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 <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/apps/mosquitto_ctrl/mosquitto_ctrl.h b/apps/mosquitto_ctrl/mosquitto_ctrl.h
@@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 #ifndef MOSQUITTO_CTRL_H
 #define MOSQUITTO_CTRL_H
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdbool.h>
 
 #include "mosquitto.h"

diff --git a/client/sub_client_output.c b/client/sub_client_output.c
@@ -38,7 +38,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 #endif
 
 #ifdef WITH_CJSON
-# include <cJSON.h>
+# include <cjson/cJSON.h>
 #endif
 
 #ifdef __APPLE__

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

diff --git 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
@@ -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
@@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <uthash.h>
 

diff --git a/plugins/dynamic-security/clients.c b/plugins/dynamic-security/clients.c
@@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <uthash.h>
 

diff --git a/plugins/dynamic-security/dynamic_security.h b/plugins/dynamic-security/dynamic_security.h
@@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
  Roger Light - initial implementation and documentation.
 */
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <uthash.h>
 #include "mosquitto.h"
 #include "password_mosq.h"

diff --git a/plugins/dynamic-security/grouplist.c b/plugins/dynamic-security/grouplist.c
@@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <uthash.h>
 

diff --git a/plugins/dynamic-security/groups.c b/plugins/dynamic-security/groups.c
@@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <uthash.h>
 

diff --git a/plugins/dynamic-security/json_help.c b/plugins/dynamic-security/json_help.c
@@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git 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 <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" */

diff --git a/plugins/dynamic-security/plugin.c b/plugins/dynamic-security/plugin.c
@@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/plugins/dynamic-security/rolelist.c b/plugins/dynamic-security/rolelist.c
@@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <string.h>
 #include <uthash.h>

diff --git a/plugins/dynamic-security/roles.c b/plugins/dynamic-security/roles.c
@@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
 
 #include "config.h"
 
-#include <cJSON.h>
+#include <cjson/cJSON.h>
 #include <stdio.h>
 #include <string.h>
 #include <uthash.h>

diff --git 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