diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-10-18 14:59:19 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-10-18 15:45:45 +0100 |
| commit | bccc3450179402ea0cf608171833dbc4f297056f (patch) | |
| tree | 26395c63d76518886f28a0778c7233f7526e9e0a /cmake | |
| parent | ed25e0e8932895686ffb5166966beb88ddcbd410 (diff) | |
| download | armnn-bccc3450179402ea0cf608171833dbc4f297056f.tar.gz | |
Github #275 Generate versionned libraries
* Improved parsing of the ArmNN's version at compile time
* Reading the version directly from the Version.hpp file, to
make sure not to break any build made with a different
build system than CMake (or Ninja)
* The version macro is set in the Version.hpp just like before,
so setting it from the command line is no longer necessary
!android-nn-driver:2126
Signed-off-by: Guillaume Gardet <guillaume.gardet@arm.com>
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Change-Id: I0820094607734d283ded030e4ded0ae6f5889c86
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ArmnnVersion.cmake | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/cmake/ArmnnVersion.cmake b/cmake/ArmnnVersion.cmake index 239b2cc69e..435e6bef37 100644 --- a/cmake/ArmnnVersion.cmake +++ b/cmake/ArmnnVersion.cmake @@ -4,22 +4,16 @@ # # Read the ArmNN version components from file -file(READ ${CMAKE_CURRENT_LIST_DIR}/../ArmnnVersion.txt armnnVersion) +file(READ ${CMAKE_CURRENT_LIST_DIR}/../include/armnn/Version.hpp armnnVersion) # Parse the ArmNN version components -string(REGEX MATCH "ARMNN_MAJOR_VERSION ([0-9]*)" _ ${armnnVersion}) +string(REGEX MATCH "#define ARMNN_MAJOR_VERSION ([0-9]*)" _ ${armnnVersion}) set(ARMNN_MAJOR_VERSION ${CMAKE_MATCH_1}) -string(REGEX MATCH "ARMNN_MINOR_VERSION ([0-9]*)" _ ${armnnVersion}) +string(REGEX MATCH "#define ARMNN_MINOR_VERSION ([0-9]*)" _ ${armnnVersion}) set(ARMNN_MINOR_VERSION ${CMAKE_MATCH_1}) -string(REGEX MATCH "ARMNN_PATCH_VERSION ([0-9]*)" _ ${armnnVersion}) -set(ARMNN_PATCH_VERSION ${CMAKE_MATCH_1}) -# Put together the ArmNN version (YYYYMMPP) -set(ARMNN_VERSION "20${ARMNN_MAJOR_VERSION}${ARMNN_MINOR_VERSION}${ARMNN_PATCH_VERSION}") +# Define LIB version +set(GENERIC_LIB_VERSION "${ARMNN_MAJOR_VERSION}.${ARMNN_MINOR_VERSION}") -# Pass the ArmNN version to the build -if(${CMAKE_VERSION} VERSION_LESS "3.12.0") - add_definitions(-DARMNN_VERSION_FROM_FILE=${ARMNN_VERSION}) -else() - add_compile_definitions(ARMNN_VERSION_FROM_FILE=${ARMNN_VERSION}) -endif() +# Define LIB soversion +set(GENERIC_LIB_SOVERSION "${ARMNN_MAJOR_VERSION}") |