Revert "Cleanup versioning strategy (#989)" (#996)

This reverts commit 12325b814f.
This commit is contained in:
Jordan Bayles
2019-07-31 11:26:48 -07:00
committed by GitHub
parent 12325b814f
commit 0d27381acf
9 changed files with 75 additions and 74 deletions

View File

@@ -45,9 +45,9 @@ set( PUBLIC_HEADERS
${JSONCPP_INCLUDE_DIR}/json/features.h
${JSONCPP_INCLUDE_DIR}/json/value.h
${JSONCPP_INCLUDE_DIR}/json/reader.h
${JSONCPP_INCLUDE_DIR}/json/version.h
${JSONCPP_INCLUDE_DIR}/json/writer.h
${JSONCPP_INCLUDE_DIR}/json/assertions.h
${PROJECT_BINARY_DIR}/include/json/version.h
)
source_group( "Public API" FILES ${PUBLIC_HEADERS} )
@@ -57,7 +57,8 @@ set(jsoncpp_sources
json_reader.cpp
json_valueiterator.inl
json_value.cpp
json_writer.cpp)
json_writer.cpp
version.h.in)
# Install instructions for this target
if(JSONCPP_WITH_CMAKE_PACKAGE)

22
src/lib_json/version.h.in Normal file
View File

@@ -0,0 +1,22 @@
// DO NOT EDIT. This file (and "version") is a template used by the build system
// (either CMake or Meson) to generate a "version.h" header file.
#ifndef JSON_VERSION_H_INCLUDED
#define JSON_VERSION_H_INCLUDED
#define JSONCPP_VERSION_STRING "@JSONCPP_VERSION@"
#define JSONCPP_VERSION_MAJOR @JSONCPP_VERSION_MAJOR@
#define JSONCPP_VERSION_MINOR @JSONCPP_VERSION_MINOR@
#define JSONCPP_VERSION_PATCH @JSONCPP_VERSION_PATCH@
#define JSONCPP_VERSION_QUALIFIER
#define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) \
| (JSONCPP_VERSION_MINOR << 16) \
| (JSONCPP_VERSION_PATCH << 8))
#ifdef JSONCPP_USING_SECURE_MEMORY
#undef JSONCPP_USING_SECURE_MEMORY
#endif
#define JSONCPP_USING_SECURE_MEMORY @JSONCPP_USE_SECURE_MEMORY@
// If non-zero, the library zeroes any memory that it has allocated before
// it frees its memory.
#endif // JSON_VERSION_H_INCLUDED