diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-03-26 18:47:46 +0000 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-03-27 14:28:19 +0000 |
| commit | 35fcc4345b6468139a7199a48f75f70d19ea0d31 (patch) | |
| tree | 3dddc99c2482b78bc8fbb236b22840bfe13eb192 | |
| parent | 396cb95774bd7627254e3befec5e34844de701c9 (diff) | |
| download | ComputeLibrary-35fcc4345b6468139a7199a48f75f70d19ea0d31.tar.gz | |
COMPMID-3248: Align SONAME and version in Version.h
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Ia8911f559f0a33ccc62e42d47825577c998c85d7
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2937
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
| -rw-r--r-- | SConscript | 11 | ||||
| -rw-r--r-- | arm_compute/core/Version.h | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/SConscript b/SConscript index f3ae8c3c86..b31f014db6 100644 --- a/SConscript +++ b/SConscript @@ -25,7 +25,10 @@ import re import subprocess VERSION = "v0.0-unreleased" -SONAME_VERSION="1.0.0" +LIBRARY_VERSION_MAJOR = 18 +LIBRARY_VERSION_MINOR = 1 +LIBRARY_VERSION_PATCH = 0 +SONAME_VERSION = str(LIBRARY_VERSION_MAJOR) + "." + str(LIBRARY_VERSION_MINOR) + "." + str(LIBRARY_VERSION_PATCH) Import('env') Import('vars') @@ -160,6 +163,12 @@ Default(generate_embed) if env["build"] == "embed_only": Return() +# Append version defines for semantic versioning +arm_compute_env.Append(CPPDEFINES = [('ARM_COMPUTE_VERSION_MAJOR', LIBRARY_VERSION_MAJOR), + ('ARM_COMPUTE_VERSION_MINOR', LIBRARY_VERSION_MINOR), + ('ARM_COMPUTE_VERSION_PATCH', LIBRARY_VERSION_PATCH)]) + + # Don't allow undefined references in the libraries: arm_compute_env.Append(LINKFLAGS=['-Wl,--no-undefined']) arm_compute_env.Append(CPPPATH =[Dir("./src/core/").path] ) diff --git a/arm_compute/core/Version.h b/arm_compute/core/Version.h index f88258f393..be3f0264bb 100644 --- a/arm_compute/core/Version.h +++ b/arm_compute/core/Version.h @@ -30,12 +30,6 @@ #define STRINGIFY2(s) #s #define STRINGIFY(s) STRINGIFY2(s) -/* Semantic versioning */ -#define ARM_COMPUTE_VERSION_MAJOR 18 -#define ARM_COMPUTE_VERSION_MINOR 0 -#define ARM_COMPUTE_VERSION_PATCH 0 -#define ARM_COMPUTE_VERSION_UNRELEASED 1 - #define ARM_COMPUTE_VERSION_STR \ STRINGIFY(ARM_COMPUTE_VERSION_MAJOR) \ "." STRINGIFY(ARM_COMPUTE_VERSION_MINOR) "." STRINGIFY(ARM_COMPUTE_VERSION_PATCH) |