From 0219e55c46e4cfd2f910783636ea5d00ba10acc8 Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Sat, 18 Jun 2022 18:35:46 -0300 Subject: [PATCH] build: replace cmakedefine with define for integers in version-defines.h Fixes https://gitlab.com/nsnam/ns-3-dev/-/issues/676 --- build-support/custom-modules/ns3-versioning.cmake | 2 +- build-support/version-defines-template.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-support/custom-modules/ns3-versioning.cmake b/build-support/custom-modules/ns3-versioning.cmake index afbe321e3..70d997c4e 100644 --- a/build-support/custom-modules/ns3-versioning.cmake +++ b/build-support/custom-modules/ns3-versioning.cmake @@ -134,7 +134,7 @@ function(configure_embedded_version) if(${VER_LIST_LEN} GREATER 2) list(GET VERSION_LIST 2 NS3_VERSION_PATCH) else() - set(NS3_VERSION_PATCH "00") + set(NS3_VERSION_PATCH "0") endif() endif() diff --git a/build-support/version-defines-template.h b/build-support/version-defines-template.h index b9e5c0e97..acf65fce8 100644 --- a/build-support/version-defines-template.h +++ b/build-support/version-defines-template.h @@ -66,7 +66,7 @@ * * Type: integer */ -#cmakedefine NS3_VERSION_MAJOR @NS3_VERSION_MAJOR@ +#define NS3_VERSION_MAJOR @NS3_VERSION_MAJOR@ /** * The minor version extracted from #NS3_VERSION_TAG @@ -76,7 +76,7 @@ * * Type: integer */ -#cmakedefine NS3_VERSION_MINOR @NS3_VERSION_MINOR@ +#define NS3_VERSION_MINOR @NS3_VERSION_MINOR@ /** * The patch number extracted from #NS3_VERSION_TAG @@ -89,7 +89,7 @@ * * Type: integer */ -#cmakedefine NS3_VERSION_PATCH @NS3_VERSION_PATCH@ +#define NS3_VERSION_PATCH @NS3_VERSION_PATCH@ /** * The portion of the #NS3_VERSION_TAG indicating the version @@ -110,7 +110,7 @@ * * Type: integer */ -#cmakedefine NS3_VERSION_TAG_DISTANCE @NS3_VERSION_TAG_DISTANCE@ +#define NS3_VERSION_TAG_DISTANCE @NS3_VERSION_TAG_DISTANCE@ /** * Hash value which uniquely identifies the commit of the