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

build: fix git describe call on older Git versions

Browse source 
Older Git versions still do not support the -C argument for specifying
the working directory. Switch to using cmake WORKING_DIRECTORY instead.

This fixes #7287 again after commit 5e7e1cb.

Signed-off-by: Henrik Brix Andersen <henrik@brixandersen.dk>
This commit is contained in:
Henrik Brix Andersen 2018-06-21 22:38:22 +02:00 committed by Kumar Gala
parent 5fa89ae164
commit ff6dbc599c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmake/app/boilerplate.cmake
View file

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