Skip to content

Commit dd97d3b

Browse files
committed
Shifting cJSON from src to dependency
1 parent aca68ad commit dd97d3b

14 files changed

Lines changed: 26 additions & 3510 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Install dependencies
1616
run: |
1717
sudo apt update
18-
sudo apt install -y build-essential cmake libcurl4-openssl-dev valgrind
18+
sudo apt install -y build-essential cmake libcurl4-openssl-dev valgrind libcjson-dev
1919
2020
- name: Build project
2121
run: |
@@ -24,7 +24,7 @@ jobs:
2424
2525
- name: Run example / test
2626
run: |
27-
./test || true
27+
./CRAW_Test_1 || true
2828
2929
- name: Run valgrind
3030
run: |

CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,17 @@ if(CURL_FOUND)
1818
else()
1919
message(FATAL_ERROR "Could not find CURL")
2020
endif()
21+
find_package(PkgConfig REQUIRED)
22+
pkg_check_modules(CJSON REQUIRED libcjson)
23+
if(CJSON_FOUND)
24+
message(STATUS "Found CJSON version: ${CJSON_VERSION_STRING}")
25+
message(STATUS "Using CJSON include dir(s): ${CJSON_INCLUDE_DIRS}")
26+
message(STATUS "Using CJSON lib(s): ${CJSON_LIBRARIES}")
27+
target_include_directories(${PROJECT_NAME} PRIVATE ${CJSON_INCLUDE_DIRS})
28+
target_link_libraries(${PROJECT_NAME} ${CJSON_LIBRARIES})
29+
else()
30+
message(FATAL_ERROR "Could not find CURL")
31+
endif()
2132

2233
install(TARGETS CRAW
2334
LIBRARY DESTINATION lib

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,14 @@ If you want to use this Wrapper, you need a reddit client id and secret key whic
6464

6565
NOTE:- Non OAuth endpoints have been implemented aswell, so the library can also be used without an API key
6666
## How to build?
67-
The project has a dependency of libcurl, it can be installed in linux by
67+
The project has a dependency of libcurl and cJSON, it can be installed in linux by
6868

6969
Ubuntu:
7070
```
71-
# sudo apt-get install curl
71+
# means to run the command as root
72+
# apt-get install curl
7273
# apt-get install libcurl4-openssl-dev
74+
# apt-get install libcjson-dev
7375
```
7476
Clone this repo using
7577
```

examples/getTopPosts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include<stdio.h>
22
#include<stdlib.h>
33
#include<CRAW/CRAW.h>
4-
#include "../include/cJSON.h"
4+
#include <cjson/cJSON.h>
55
int main(){
66
CRAW *handle=CRAW_Init(
77
NULL,

include/cJSON.h

Lines changed: 0 additions & 306 deletions
This file was deleted.

src/CRAW_Account.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ YOU HAVE BEEN WARNED
2525
#include "../include/CRAW_PRIVATE.h"
2626
#include "CRAW_Main.h"
2727
#include<curl/curl.h>
28-
#include "../include/cJSON.h"
28+
#include <cjson/cJSON.h>
2929
#include<stdlib.h>
3030
#include<string.h>
3131
#include "../include/CRAW_Account.h"

src/CRAW_Links.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ YOU HAVE BEEN WARNED
2424
#include <string.h>
2525
#include <stdlib.h>
2626
#include <curl/curl.h>
27-
#include "../include/cJSON.h"
27+
#include <cjson/cJSON.h>
2828
#define CRAW_PRIVATE_DO_NOT_MESS
2929
#include "../include/CRAW_PRIVATE.h"
3030
#include <stdlib.h>

src/CRAW_Listing.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ YOU HAVE BEEN WARNED
2424
#include <string.h>
2525
#include <stdlib.h>
2626
#include <curl/curl.h>
27-
#include "../include/cJSON.h"
27+
#include <cjson/cJSON.h>
2828
#define CRAW_PRIVATE_DO_NOT_MESS
2929
#include "../include/CRAW_PRIVATE.h"
3030
#include <stdlib.h>

src/CRAW_Main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ YOU HAVE BEEN WARNED
2424
#include<string.h>
2525
#include<stdlib.h>
2626
#include<curl/curl.h>
27-
#include "../include/cJSON.h"
27+
#include <cjson/cJSON.h>
2828
#include "../include/CRAW_Main.h"
2929
#define CRAW_PRIVATE_DO_NOT_MESS
3030
#include "../include/CRAW_PRIVATE.h"

src/CRAW_Message.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ YOU HAVE BEEN WARNED
2424
#include <string.h>
2525
#include <stdlib.h>
2626
#include <curl/curl.h>
27-
#include "../include/cJSON.h"
27+
#include <cjson/cJSON.h>
2828
#define CRAW_PRIVATE_DO_NOT_MESS
2929
#include "../include/CRAW_PRIVATE.h"
3030
#include <stdlib.h>

0 commit comments

Comments
 (0)