3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-28 03:50:53 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44 from cdunn2001/version

Browse Source 
0.7.0
This commit is contained in:
Christopher Dunn 2014-09-16 12:49:16 -07:00
commit 263a4706fa
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev.makefile
View File

@ -2,7 +2,7 @@ all: build test-amalgamate
build: build:
mkdir -p build/debug mkdir -p build/debug
cd build/debug; cmake -DCMAKE_BUILD_TYPE=debug -DJSONCPP_LIB_BUILD_SHARED=OFF -G "Unix Makefiles" ../.. cd build/debug; cmake -DCMAKE_BUILD_TYPE=debug -DJSONCPP_LIB_BUILD_SHARED=ON -G "Unix Makefiles" ../..
make -C build/debug make -C build/debug
# Currently, this depends on include/json/version.h generated # Currently, this depends on include/json/version.h generated

16
include/json/version.h
View File

@ -2,15 +2,13 @@
// and "version.h.in" files. // and "version.h.in" files.
// Run CMake configure step to update it. // Run CMake configure step to update it.
#ifndef JSON_VERSION_H_INCLUDED #ifndef JSON_VERSION_H_INCLUDED
#define JSON_VERSION_H_INCLUDED # define JSON_VERSION_H_INCLUDED
#define JSONCPP_VERSION_STRING "0.6.0-dev" # define JSONCPP_VERSION_STRING "0.7.0"
#define JSONCPP_VERSION_MAJOR 0 # define JSONCPP_VERSION_MAJOR 0
#define JSONCPP_VERSION_MINOR 6 # define JSONCPP_VERSION_MINOR 7
#define JSONCPP_VERSION_PATCH 0 # define JSONCPP_VERSION_PATCH 0
#define JSONCPP_VERSION_QUALIFIER -dev # define JSONCPP_VERSION_QUALIFIER
#define JSONCPP_VERSION_HEXA \ # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))
((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | \
(JSONCPP_VERSION_PATCH << 8))
#endif // JSON_VERSION_H_INCLUDED #endif // JSON_VERSION_H_INCLUDED

2
src/lib_json/CMakeLists.txt
View File

@ -37,7 +37,7 @@ ADD_LIBRARY( jsoncpp_lib ${JSONCPP_LIB_TYPE}
version.h.in version.h.in
) )
SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp ) SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp )
SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSON_CPP_VERSION} SOVERSION ${JSON_CPP_VERSION} ) SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR} )
# Install instructions for this target # Install instructions for this target
INSTALL( TARGETS jsoncpp_lib INSTALL( TARGETS jsoncpp_lib

2
version
View File

@ -1 +1 @@
0.6.0-dev 0.7.0