diff --git a/CMakeLists.txt b/CMakeLists.txt index ea12e5187f47f72096cb66944b3a967acc191dc4..c37381b5adcd5de2716fdaa43473367905c9aeba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ include(GNUInstallDirs) project(cJSON C) set(PROJECT_VERSION_MAJOR 1) -set(PROJECT_VERSION_MINOR 4) -set(PROJECT_VERSION_PATCH 7) +set(PROJECT_VERSION_MINOR 5) +set(PROJECT_VERSION_PATCH 0) set(CJSON_VERSION_SO 1) set(CJSON_UTILS_VERSION_SO 1) set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") diff --git a/Makefile b/Makefile index f7ab85f7f87aa7f39f3f5acbd6a483a34079e4c3..ecbc765950a62d818c8cbbe7ed1bb25b2cb4bdf1 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c LDLIBS = -lm -LIBVERSION = 1.4.7 +LIBVERSION = 1.5.0 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c index cf46d39365527c05599692abb01284941a3b2d77..e653a1c013ead4cff53c9c611f4b443e0f053ee4 100644 --- a/cJSON.c +++ b/cJSON.c @@ -58,7 +58,7 @@ CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void) } /* This is a safeguard to prevent copy-pasters from using incompatible C and header files */ -#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 4) || (CJSON_VERSION_PATCH != 7) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 0) #error cJSON.h and cJSON.c have different versions. Make sure that both have the same. #endif diff --git a/cJSON.h b/cJSON.h index 9d7f3ca3092ff1952bc232214d5e0eafeaca9056..622bcf58019ea9669354516b1195a4db2710a55c 100644 --- a/cJSON.h +++ b/cJSON.h @@ -30,8 +30,8 @@ extern "C" /* project version */ #define CJSON_VERSION_MAJOR 1 -#define CJSON_VERSION_MINOR 4 -#define CJSON_VERSION_PATCH 7 +#define CJSON_VERSION_MINOR 5 +#define CJSON_VERSION_PATCH 0 #include