mirror of
https://github.com/json-c/json-c.git
synced 2026-09-07 08:36:50 +08:00
Update the master branch to version 0.19.99
This commit is contained in:
+2
-2
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.9...3.12)
|
|||||||
|
|
||||||
# JSON-C library is C only project.
|
# JSON-C library is C only project.
|
||||||
# PROJECT_VERSION{,_MAJOR,_MINOR,_PATCH} set by project():
|
# PROJECT_VERSION{,_MAJOR,_MINOR,_PATCH} set by project():
|
||||||
project(json-c LANGUAGES C VERSION 0.18.99)
|
project(json-c LANGUAGES C VERSION 0.19.99)
|
||||||
|
|
||||||
# set default build type if not specified by user
|
# set default build type if not specified by user
|
||||||
if(NOT CMAKE_BUILD_TYPE)
|
if(NOT CMAKE_BUILD_TYPE)
|
||||||
@@ -544,7 +544,7 @@ add_library(${PROJECT_NAME}
|
|||||||
${JSON_C_RESOURCES}
|
${JSON_C_RESOURCES}
|
||||||
)
|
)
|
||||||
set_target_properties(${PROJECT_NAME} PROPERTIES
|
set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||||
VERSION 5.4.0
|
VERSION 5.5.0
|
||||||
SOVERSION 5)
|
SOVERSION 5)
|
||||||
list(APPEND CMAKE_TARGETS ${PROJECT_NAME})
|
list(APPEND CMAKE_TARGETS ${PROJECT_NAME})
|
||||||
# If json-c is used as subroject it set to target correct interface -I flags and allow
|
# If json-c is used as subroject it set to target correct interface -I flags and allow
|
||||||
|
|||||||
@@ -189,3 +189,7 @@ JSONC_0.19 {
|
|||||||
json_pointer_set_with_cb;
|
json_pointer_set_with_cb;
|
||||||
json_object_array_put_with_idx_limit_cb;
|
json_object_array_put_with_idx_limit_cb;
|
||||||
} JSONC_0.18;
|
} JSONC_0.18;
|
||||||
|
|
||||||
|
JSONC_0.20 {
|
||||||
|
# global:
|
||||||
|
} JSONC_0.19;
|
||||||
|
|||||||
+2
-2
@@ -17,11 +17,11 @@ extern "C" {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define JSON_C_MAJOR_VERSION 0
|
#define JSON_C_MAJOR_VERSION 0
|
||||||
#define JSON_C_MINOR_VERSION 18
|
#define JSON_C_MINOR_VERSION 19
|
||||||
#define JSON_C_MICRO_VERSION 99
|
#define JSON_C_MICRO_VERSION 99
|
||||||
#define JSON_C_VERSION_NUM \
|
#define JSON_C_VERSION_NUM \
|
||||||
((JSON_C_MAJOR_VERSION << 16) | (JSON_C_MINOR_VERSION << 8) | JSON_C_MICRO_VERSION)
|
((JSON_C_MAJOR_VERSION << 16) | (JSON_C_MINOR_VERSION << 8) | JSON_C_MICRO_VERSION)
|
||||||
#define JSON_C_VERSION "0.18.99"
|
#define JSON_C_VERSION "0.19.99"
|
||||||
|
|
||||||
#ifndef JSON_EXPORT
|
#ifndef JSON_EXPORT
|
||||||
#if defined(_MSC_VER) && defined(JSON_C_DLL)
|
#if defined(_MSC_VER) && defined(JSON_C_DLL)
|
||||||
|
|||||||
Reference in New Issue
Block a user