Revert to JSONCPP_(SO)?VERSION_*

Author: baylesj

CMakeLists.txt

@@ -61,19 +61,19 @@ if(CCACHE_EXECUTABLE)
     set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_EXECUTABLE}" CACHE PATH "ccache" FORCE)
 endif()
 
-project(jsoncpp
+project(JSONCPP
         # Note: version must be updated in three places when doing a release. This
         # annoying process ensures that amalgamate, CMake, and meson all report the
         # correct version.
         # 1. ./meson.build
         # 2. ./include/json/version.h
         # 3. ./CMakeLists.txt
-        # IMPORTANT: also bump the PROJECT_SOVERSION by 1!!!
+        # IMPORTANT: also bump the JSONCPP_SOVERSION by 1!!!
         VERSION 1.9.4 # <major>[.<minor>[.<patch>[.<tweak>]]]
         LANGUAGES CXX)
 
-message(STATUS "JsonCpp Version: ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-set(PROJECT_SOVERSION 24)
+message(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}")
+set(JSONCPP_SOVERSION 24)
 
 option(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" ON)
 option(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" ON)
@@ -169,7 +169,7 @@ if(JSONCPP_WITH_CMAKE_PACKAGE)
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/jsoncpp
         FILE        jsoncppConfig.cmake)
     write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/jsoncppConfigVersion.cmake"
-        VERSION ${PROJECT_VERSION}
+        VERSION ${JSONCPP_VERSION}
         COMPATIBILITY SameMajorVersion)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jsoncppConfigVersion.cmake
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/jsoncpp)

doc/doxyfile.in

@@ -38,7 +38,7 @@ PROJECT_NAME           = "JsonCpp"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = %PROJECT_VERSION%
+PROJECT_NUMBER         = %JSONCPP_VERSION%
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1215,7 +1215,7 @@ GENERATE_HTMLHELP      = %HTML_HELP%
 # written to the html output directory.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = jsoncpp-%PROJECT_VERSION%.chm
+CHM_FILE               = jsoncpp-%JSONCPP_VERSION%.chm
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler ( hhc.exe). If non-empty

doc/web_doxyfile.in

@@ -38,7 +38,7 @@ PROJECT_NAME           = "JsonCpp"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = %PROJECT_VERSION%
+PROJECT_NUMBER         = %JSONCPP_VERSION%
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1215,7 +1215,7 @@ GENERATE_HTMLHELP      = %HTML_HELP%
 # written to the html output directory.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = jsoncpp-%PROJECT_VERSION%.chm
+CHM_FILE               = jsoncpp-%JSONCPP_VERSION%.chm
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler ( hhc.exe). If non-empty

doxybuild.py

@@ -113,7 +113,7 @@ def build_doc(options,  make_release=False):
     def yesno(bool):
         return bool and 'YES' or 'NO'
     subst_keys = {
-        '%PROJECT_VERSION%': version,
+        '%JSONCPP_VERSION%': version,
         '%DOC_TOPDIR%': '',
         '%TOPDIR%': top_dir,
         '%HTML_OUTPUT%': os.path.join('..', output_dir, html_output_dirname),

include/json/version.h

@@ -7,17 +7,17 @@
 // 1. /meson.build
 // 2. /include/json/version.h
 // 3. /CMakeLists.txt
-// IMPORTANT: update both the PROJECT_VERSION_STRING as well as the
+// IMPORTANT: update both the JSONCPP_VERSION_STRING as well as the
 //            major, minor, and patch fields as appropriate here.
 
-#define PROJECT_VERSION_STRING "1.9.4"
-#define PROJECT_VERSION_MAJOR 1
-#define PROJECT_VERSION_MINOR 9
-#define PROJECT_VERSION_PATCH 4
-#define PROJECT_VERSION_QUALIFIER
-#define PROJECT_VERSION_HEXA                                                   \
-  ((PROJECT_VERSION_MAJOR << 24) | (PROJECT_VERSION_MINOR << 16) |             \
-   (PROJECT_VERSION_PATCH << 8))
+#define JSONCPP_VERSION_STRING "1.9.4"
+#define JSONCPP_VERSION_MAJOR 1
+#define JSONCPP_VERSION_MINOR 9
+#define JSONCPP_VERSION_PATCH 4
+#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

pkg-config/jsoncpp.pc.in

@@ -5,7 +5,7 @@ includedir=@includedir_for_pc_file@
 
 Name: jsoncpp
 Description: A C++ library for interacting with JSON
-Version: @PROJECT_VERSION@
+Version: @JSONCPP_VERSION@
 URL: https://github.com/open-source-parsers/jsoncpp
 Libs: -L${libdir} -ljsoncpp
 Cflags: -I${includedir}

src/lib_json/CMakeLists.txt

@@ -127,8 +127,8 @@ if(BUILD_SHARED_LIBS)
     add_library(${SHARED_LIB} SHARED ${PUBLIC_HEADERS} ${JSONCPP_SOURCES})
     set_target_properties(${SHARED_LIB} PROPERTIES
         OUTPUT_NAME jsoncpp
-        VERSION ${PROJECT_VERSION}
-        SOVERSION ${PROJECT_SOVERSION}
+        VERSION ${JSONCPP_VERSION}
+        SOVERSION ${JSONCPP_SOVERSION}
         POSITION_INDEPENDENT_CODE ON
     )
 
@@ -161,7 +161,7 @@ if(BUILD_STATIC_LIBS)
 
     set_target_properties(${STATIC_LIB} PROPERTIES
         OUTPUT_NAME jsoncpp${STATIC_SUFFIX}
-        VERSION ${PROJECT_VERSION}
+        VERSION ${JSONCPP_VERSION}
     )
 
     # Set library's runtime search path on OSX
@@ -188,8 +188,8 @@ if(BUILD_OBJECT_LIBS)
 
     set_target_properties(${OBJECT_LIB} PROPERTIES
         OUTPUT_NAME jsoncpp
-        VERSION ${PROJECT_VERSION}
-        SOVERSION ${PROJECT_SOVERSION}
+        VERSION ${JSONCPP_VERSION}
+        SOVERSION ${JSONCPP_SOVERSION}
         POSITION_INDEPENDENT_CODE ON
     )
 

src/test_lib_json/main.cpp

@@ -3920,9 +3920,9 @@ class VersionTest : public JsonTest::TestCase {};
 
 JSONTEST_FIXTURE_LOCAL(VersionTest, VersionNumbersMatch) {
   std::ostringstream vstr;
-  vstr << PROJECT_VERSION_MAJOR << '.' << PROJECT_VERSION_MINOR << '.'
-       << PROJECT_VERSION_PATCH;
-  JSONTEST_ASSERT_EQUAL(vstr.str(), std::string(PROJECT_VERSION_STRING));
+  vstr << JSONCPP_VERSION_MAJOR << '.' << JSONCPP_VERSION_MINOR << '.'
+       << JSONCPP_VERSION_PATCH;
+  JSONTEST_ASSERT_EQUAL(vstr.str(), std::string(JSONCPP_VERSION_STRING));
 }
 
 #if defined(__GNUC__)

version.in

@@ -1 +1 @@
-@PROJECT_VERSION@
+@JSONCPP_VERSION@