Update the master branch to version 0.18.99
This commit is contained in:
@@ -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.17.99)
|
project(json-c LANGUAGES C VERSION 0.18.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)
|
||||||
@@ -470,7 +470,7 @@ add_library(${PROJECT_NAME}
|
|||||||
${JSON_C_HEADERS}
|
${JSON_C_HEADERS}
|
||||||
)
|
)
|
||||||
set_target_properties(${PROJECT_NAME} PROPERTIES
|
set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||||
VERSION 5.3.0
|
VERSION 5.4.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
|
||||||
|
|||||||
15
ChangeLog
15
ChangeLog
@@ -1,3 +1,18 @@
|
|||||||
|
0.18.99 (future release)
|
||||||
|
========================================
|
||||||
|
|
||||||
|
Deprecated and removed features:
|
||||||
|
--------------------------------
|
||||||
|
* none yet
|
||||||
|
|
||||||
|
New features
|
||||||
|
------------
|
||||||
|
* none yet
|
||||||
|
|
||||||
|
Significant changes and bug fixes
|
||||||
|
---------------------------------
|
||||||
|
* none yet
|
||||||
|
|
||||||
0.18 (up to commit 6bfab90, 2023-09-15)
|
0.18 (up to commit 6bfab90, 2023-09-15)
|
||||||
========================================
|
========================================
|
||||||
|
|
||||||
|
|||||||
@@ -180,3 +180,7 @@ JSONC_0.17 {
|
|||||||
JSONC_0.18 {
|
JSONC_0.18 {
|
||||||
# global:
|
# global:
|
||||||
} JSONC_0.17;
|
} JSONC_0.17;
|
||||||
|
|
||||||
|
JSONC_0.19 {
|
||||||
|
# global:
|
||||||
|
} JSONC_0.18;
|
||||||
|
|||||||
@@ -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 17
|
#define JSON_C_MINOR_VERSION 18
|
||||||
#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.17.99"
|
#define JSON_C_VERSION "0.18.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