patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

cmake: fix git describe command line

Browse source 
The "git describe" call for setting the boot banner is broken. The
--work-tree option sets the checked out work tree, not the directory
containing .git, which is where git describe needs to look for
information on tags.

Use -C instead so it's as if Git were run from the zephyr base
directory instead.

Signed-off-by: Marti Bolivar <marti@opensourcefoundries.com>
This commit is contained in:
Marti Bolivar 2018-06-19 16:01:28 -04:00 committed by Anas Nashif
parent 2d71236a36
commit 5e7e1cba69
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmake/app/boilerplate.cmake
View file

@ -251,8 +251,7 @@ include(${ZEPHYR_BASE}/cmake/toolchain.cmake)
find_package(Git QUIET)
if(GIT_FOUND)
execute_process(COMMAND ${GIT_EXECUTABLE} --work-tree=${ZEPHYR_BASE} describe
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
execute_process(COMMAND ${GIT_EXECUTABLE} -C ${ZEPHYR_BASE} describe
OUTPUT_VARIABLE BUILD_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()