From b2a1ca5b5498e79e5c530e02dc393a31976c02b6 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Tue, 16 Sep 2014 12:25:54 -0700 Subject: [PATCH 1/4] in dev.makefile, build shared too --- dev.makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev.makefile b/dev.makefile index 7a96af8..dd16bdd 100644 --- a/dev.makefile +++ b/dev.makefile @@ -2,7 +2,7 @@ all: build test-amalgamate build: 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 # Currently, this depends on include/json/version.h generated From 16709c6ee8e4b67d2632ac2b462feb73c5618655 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Tue, 16 Sep 2014 12:30:09 -0700 Subject: [PATCH 2/4] JSONCPP_VERSION, not JSON_CPP_VERSION --- src/lib_json/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt index dc3d977..3e7d5b6 100644 --- a/src/lib_json/CMakeLists.txt +++ b/src/lib_json/CMakeLists.txt @@ -37,7 +37,7 @@ ADD_LIBRARY( jsoncpp_lib ${JSONCPP_LIB_TYPE} version.h.in ) 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} ) # Install instructions for this target INSTALL( TARGETS jsoncpp_lib From 877dd17206ef51ed19f8f0f120bd50ec35aa5a60 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Tue, 16 Sep 2014 12:35:12 -0700 Subject: [PATCH 3/4] bump version; proper SOVERSION --- src/lib_json/CMakeLists.txt | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt index 3e7d5b6..16036d1 100644 --- a/src/lib_json/CMakeLists.txt +++ b/src/lib_json/CMakeLists.txt @@ -37,7 +37,7 @@ ADD_LIBRARY( jsoncpp_lib ${JSONCPP_LIB_TYPE} version.h.in ) SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp ) -SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION} ) +SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR} ) # Install instructions for this target INSTALL( TARGETS jsoncpp_lib diff --git a/version b/version index 7defe1e..bcaffe1 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.6.0-dev \ No newline at end of file +0.7.0 \ No newline at end of file From 4bceabf2f9d9837fd62cbed740bcbda062876298 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Tue, 16 Sep 2014 19:09:09 -0700 Subject: [PATCH 4/4] ws autogen --- include/json/version.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/include/json/version.h b/include/json/version.h index 91c4a93..ca5c283 100644 --- a/include/json/version.h +++ b/include/json/version.h @@ -2,15 +2,13 @@ // and "version.h.in" files. // Run CMake configure step to update it. #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_MAJOR 0 -#define JSONCPP_VERSION_MINOR 6 -#define JSONCPP_VERSION_PATCH 0 -#define JSONCPP_VERSION_QUALIFIER -dev -#define JSONCPP_VERSION_HEXA \ - ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | \ - (JSONCPP_VERSION_PATCH << 8)) +# define JSONCPP_VERSION_STRING "0.7.0" +# define JSONCPP_VERSION_MAJOR 0 +# define JSONCPP_VERSION_MINOR 7 +# define JSONCPP_VERSION_PATCH 0 +# define JSONCPP_VERSION_QUALIFIER +# define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8)) #endif // JSON_VERSION_H_INCLUDED