From bccc3450179402ea0cf608171833dbc4f297056f Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Fri, 18 Oct 2019 14:59:19 +0100 Subject: 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 Signed-off-by: Matteo Martincigh Change-Id: I0820094607734d283ded030e4ded0ae6f5889c86 --- src/armnnSerializer/CMakeLists.txt | 1 + src/armnnTfLiteParser/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) (limited to 'src') diff --git a/src/armnnSerializer/CMakeLists.txt b/src/armnnSerializer/CMakeLists.txt index 225999bbc4..ccc924e641 100755 --- a/src/armnnSerializer/CMakeLists.txt +++ b/src/armnnSerializer/CMakeLists.txt @@ -43,4 +43,5 @@ if(BUILD_ARMNN_SERIALIZER) install(TARGETS armnnSerializer LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + set_target_properties(armnnSerializer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) endif() diff --git a/src/armnnTfLiteParser/CMakeLists.txt b/src/armnnTfLiteParser/CMakeLists.txt index 17d4cf68c2..ae60079ab6 100755 --- a/src/armnnTfLiteParser/CMakeLists.txt +++ b/src/armnnTfLiteParser/CMakeLists.txt @@ -21,6 +21,8 @@ if(BUILD_TF_LITE_PARSER) target_link_libraries(armnnTfLiteParser ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY}) target_link_libraries(armnnTfLiteParser armnn ${FLATBUFFERS_LIBRARY}) + set_target_properties(armnnTfLiteParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) + install(TARGETS armnnTfLiteParser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -- cgit v1.2.1