authorgravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2019-09-02 17:45:30-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-02 21:36:16-04:00
log00d82e34df92c181d20064c0c2f80feaba9dab03
tree75ffe413d8e85077e8ece6fb0cd2d980b62d45db
parent4a5b0cde1330e0410612838a42dad62cc30b0e92

cmake: improve building without git repository

- quiet `fatal: not a git repository` message - if git probe fails skip ZIG_VERSION modification

1 files changed, 10 insertions(+), 6 deletions(-)

CMakeLists.txt+10-6
......@@ -23,14 +23,18 @@ find_program(GIT_EXE NAMES git)
2323if(GIT_EXE)
2424 execute_process(
2525 COMMAND ${GIT_EXE} -C ${CMAKE_SOURCE_DIR} name-rev HEAD --tags --name-only --no-undefined --always
26 RESULT_VARIABLE EXIT_STATUS
2627 OUTPUT_VARIABLE ZIG_GIT_REV
27 OUTPUT_STRIP_TRAILING_WHITESPACE)
28 if(ZIG_GIT_REV MATCHES "\\^0$")
29 if(NOT("${ZIG_GIT_REV}" STREQUAL "${ZIG_VERSION}^0"))
30 message("WARNING: Tag does not match configured Zig version")
28 OUTPUT_STRIP_TRAILING_WHITESPACE
29 ERROR_QUIET)
30 if(EXIT_STATUS EQUAL "0")
31 if(ZIG_GIT_REV MATCHES "\\^0$")
32 if(NOT("${ZIG_GIT_REV}" STREQUAL "${ZIG_VERSION}^0"))
33 message("WARNING: Tag does not match configured Zig version")
34 endif()
35 else()
36 set(ZIG_VERSION "${ZIG_VERSION}+${ZIG_GIT_REV}")
3137 endif()
32 else()
33 set(ZIG_VERSION "${ZIG_VERSION}+${ZIG_GIT_REV}")
3438 endif()
3539endif()
3640message("Configuring zig version ${ZIG_VERSION}")