Merge pull request #44 from cdunn2001/version

0.7.0

Author: cdunn2001

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

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

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_MAJOR} )
 
 # Install instructions for this target
 INSTALL( TARGETS jsoncpp_lib

version

@@ -1 +1 @@
-0.6.0-dev
+0.7.0