diff --git a/dev.makefile b/dev.makefile index 7a96af891..dd16bdd6e 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 diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt index dc3d9772e..16036d134 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_MAJOR} ) # Install instructions for this target INSTALL( TARGETS jsoncpp_lib diff --git a/version b/version index 7defe1ea1..bcaffe19b 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