blender
/
blender
134
398
Fork 581
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

CMake: Suppress unconfigured branch upstream error in the output

This commit is contained in:
Sergey Sharybin 2015-03-20 13:59:05 +05:00
parent 1cd4070e35
commit 6de12b1b43
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_files/cmake/buildinfo.cmake
View File

@ -60,7 +60,8 @@ if(EXISTS ${SOURCE_DIR}/.git)
execute_process(COMMAND git log HEAD..@{u}
WORKING_DIRECTORY ${SOURCE_DIR}
OUTPUT_VARIABLE _git_below_check
OUTPUT_STRIP_TRAILING_WHITESPACE)
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
if(NOT _git_below_check STREQUAL "")
# If there're commits between HEAD and upstream this means
# that we're reset-ed to older revision. Use it's hash then.