Add additional replacement variables in generated version header and make macro names specific to the package

Author: langmm

CHANGELOG.md

@@ -5,6 +5,8 @@ Because YggdrasilRapidJSON continues to merge updates from RapidJSON, the RapidJ
 
 ## X.X.X.X - XXXX-XX-XX
 
+## 1.1.0.4 - 2026-05-XX
+
 ### Bug fixes
 * Fix bug where version could not be set in the conda recipe build since it is created from a tar instead of the git repo
 

CMakeLists.txt

@@ -20,7 +20,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/YggdrasilRapidJSONMacros.cmake)
 set(YGGDRASIL_RAPIDJSON_VERSION "" CACHE STRING "Version to use instead of the git tag version")
 
 if(NOT YGGDRASIL_RAPIDJSON_VERSION)
-  gitversion(YGGDRASIL_RAPIDJSON_VERSION "1.1.0.2")
+  yggdrasil_rapidjson_gitversion(YGGDRASIL_RAPIDJSON_VERSION "1.1.0.2")
 endif()
 message(STATUS "YGGDRASIL_RAPIDJSON_VERSION = ${YGGDRASIL_RAPIDJSON_VERSION}")
 
@@ -268,7 +268,7 @@ SET(CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" CACHE PATH "The directory cmake fi
 # ===============================
 
 # Version header
-generate_version_header(
+yggdrasil_rapidjson_version_header(
   ${PROJECT_NAME_UPPER}
   ${PROJECT_VERSION}
   ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME_LOWER}/${PROJECT_NAME_LOWER}_version.h.in

YggdrasilRapidJSONMacros.cmake

@@ -148,7 +148,7 @@ macro(yggdrasil_rapidjson_options_config OUTPUT_PREFIX)
 
 endmacro()
 
-macro(gitversion OUTPUT_VARIABLE DEFAULT)
+macro(yggdrasil_rapidjson_gitversion OUTPUT_VARIABLE DEFAULT)
   find_package(Git)
   if(NOT Git_FOUND)
     message(STATUS "Failed to find Git cmake package, falling back to version ${DEFAULT}")
@@ -182,7 +182,7 @@ macro(gitversion OUTPUT_VARIABLE DEFAULT)
   endif()
 endmacro()
 
-function(generate_version_header MACRO_PREFIX VERSION_STRING SRC DST)
+function(yggdrasil_rapidjson_version_header MACRO_PREFIX VERSION_STRING SRC DST)
   set(rem ${VERSION_STRING})
   set(idx 0)
   set(parts)

include/yggdrasil_rapidjson/yggdrasil_rapidjson_version.h

@@ -36,7 +36,7 @@
 #define YGGDRASIL_RAPIDJSON_MAJOR_VERSION 1
 #define YGGDRASIL_RAPIDJSON_MINOR_VERSION 1
 #define YGGDRASIL_RAPIDJSON_PATCH_VERSION 0
-#define YGGDRASIL_RAPIDJSON_EXTEN_VERSION 3
+#define YGGDRASIL_RAPIDJSON_EXTEN_VERSION 4
 #define YGGDRASIL_RAPIDJSON_VERSION_STRING \
     YGGDRASIL_RAPIDJSON_STRINGIFY(YGGDRASIL_RAPIDJSON_MAJOR_VERSION.YGGDRASIL_RAPIDJSON_MINOR_VERSION.YGGDRASIL_RAPIDJSON_PATCH_VERSION.YGGDRASIL_RAPIDJSON_EXTEN_VERSION)
 

include/yggdrasil_rapidjson/yggdrasil_rapidjson_version.h.in

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// YGGDRASIL_RAPIDJSON_VERSION_STRING
+// @MACRO_PREFIX@_VERSION_STRING
 //
 #ifndef @MACRO_PREFIX@_VERSION_H_
 #define @MACRO_PREFIX@_VERSION_H_
@@ -13,21 +13,21 @@
 /*! \def @MACRO_PREFIX@_MAJOR_VERSION
     \ingroup @MACRO_PREFIX@_CONFIG
     \brief Major version of RapidJSON in integer
-    that this version of YggdrasilRapidJSON is based on.
+    that this version of @PROJECT_NAME@ is based on.
 */
 /*! \def @MACRO_PREFIX@_MINOR_VERSION
     \ingroup @MACRO_PREFIX@_CONFIG
     \brief Minor version of RapidJSON in integer
-    that this version of YggdrasilRapidJSON is based on.
+    that this version of @PROJECT_NAME@ is based on.
 */
 /*! \def @MACRO_PREFIX@_PATCH_VERSION
     \ingroup @MACRO_PREFIX@_CONFIG
     \brief Patch version of RapidJSON in integer
-    that this version of YggdrasilRapidJSON is based on.
+    that this version of @PROJECT_NAME@ is based on.
 */
 /*! \def @MACRO_PREFIX@_EXTEN_VERSION
     \ingroup @MACRO_PREFIX@_CONFIG
-    \brief Version of YggdrasilRapidJSON based on RapidJSON.
+    \brief Version of @PROJECT_NAME@ based on RapidJSON.
 */
 /*! \def @MACRO_PREFIX@_VERSION_STRING
     \ingroup @MACRO_PREFIX@_CONFIG