Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: improve building without git repository 

- quiet `fatal: not a git repository` message
- if git probe fails skip ZIG_VERSION modification
master
Michael Dusan 2019-09-02 17:45:30 -04:00 committed by Andrew Kelley
parent 4a5b0cde13
commit 00d82e34df
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -23,14 +23,18 @@ find_program(GIT_EXE NAMES git)
if(GIT_EXE) if(GIT_EXE)
execute_process( execute_process(
COMMAND ${GIT_EXE} -C ${CMAKE_SOURCE_DIR} name-rev HEAD --tags --name-only --no-undefined --always COMMAND ${GIT_EXE} -C ${CMAKE_SOURCE_DIR} name-rev HEAD --tags --name-only --no-undefined --always
RESULT_VARIABLE EXIT_STATUS
OUTPUT_VARIABLE ZIG_GIT_REV OUTPUT_VARIABLE ZIG_GIT_REV
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE
if(ZIG_GIT_REV MATCHES "\\^0$") ERROR_QUIET)
if(NOT("${ZIG_GIT_REV}" STREQUAL "${ZIG_VERSION}^0")) if(EXIT_STATUS EQUAL "0")
message("WARNING: Tag does not match configured Zig version") if(ZIG_GIT_REV MATCHES "\\^0$")
if(NOT("${ZIG_GIT_REV}" STREQUAL "${ZIG_VERSION}^0"))
message("WARNING: Tag does not match configured Zig version")
endif()
else()
set(ZIG_VERSION "${ZIG_VERSION}+${ZIG_GIT_REV}")
endif() endif()
else()
set(ZIG_VERSION "${ZIG_VERSION}+${ZIG_GIT_REV}")
endif() endif()
endif() endif()
message("Configuring zig version ${ZIG_VERSION}") message("Configuring zig version ${ZIG_VERSION}")