From 649e8e1756397f65c8c79681b3aec5f3505432d5 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Thu, 17 Jun 2021 10:01:02 -0700 Subject: [PATCH] [cmake] always use git hash for default package version (#6717) --- CMakeLists.txt | 6 +----- etc/cmake/functions.cmake | 10 ++++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cbfa8dda3..119395785 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,11 +98,7 @@ message(STATUS "Package Name: ${OT_PACKAGE_NAME}") set(OT_PACKAGE_VERSION "" CACHE STRING "OpenThread Package Version") if(OT_PACKAGE_VERSION STREQUAL "") - execute_process( - COMMAND bash "-c" "third_party/nlbuild-autotools/repo/scripts/mkversion -b ${OT_DEFAULT_VERSION}" - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - OUTPUT_VARIABLE OT_PACKAGE_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE - ) + ot_git_version(OT_PACKAGE_VERSION) message(STATUS "Setting default package version: ${OT_PACKAGE_VERSION}") endif() target_compile_definitions(ot-config INTERFACE "PACKAGE_VERSION=\"${OT_PACKAGE_VERSION}\"") diff --git a/etc/cmake/functions.cmake b/etc/cmake/functions.cmake index 4cb0bef8c..464b106af 100755 --- a/etc/cmake/functions.cmake +++ b/etc/cmake/functions.cmake @@ -41,3 +41,13 @@ function(ot_get_platforms arg_platforms) list(SORT result) set(${arg_platforms} "${result}" PARENT_SCOPE) endfunction() + +function(ot_git_version git_version) + execute_process( + COMMAND git describe --dirty --always + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + OUTPUT_VARIABLE GIT_REV OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) + set(${git_version} "${GIT_REV}" PARENT_SCOPE) +endfunction()