| ... | @@ -8,10 +8,26 @@ endif() | ... | @@ -8,10 +8,26 @@ endif() |
| 8 | project(zig C CXX) | 8 | project(zig C CXX) |
| 9 | set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) | 9 | set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) |
| 10 | | 10 | |
| | 11 | |
| 11 | set(ZIG_VERSION_MAJOR 0) | 12 | set(ZIG_VERSION_MAJOR 0) |
| 12 | set(ZIG_VERSION_MINOR 0) | 13 | set(ZIG_VERSION_MINOR 0) |
| 13 | set(ZIG_VERSION_PATCH 0) | 14 | set(ZIG_VERSION_PATCH 0) |
| 14 | set(ZIG_VERSION "${ZIG_VERSION_MAJOR}.${ZIG_VERSION_MINOR}.${ZIG_VERSION_PATCH}") | 15 | set(ZIG_VERSION "${ZIG_VERSION_MAJOR}.${ZIG_VERSION_MINOR}.${ZIG_VERSION_PATCH}") |
| | 16 | |
| | 17 | find_program(GIT_EXE NAMES git) |
| | 18 | if(GIT_EXE) |
| | 19 | execute_process( |
| | 20 | COMMAND ${GIT_EXE} name-rev HEAD --tags --name-only --no-undefined --always |
| | 21 | OUTPUT_VARIABLE ZIG_GIT_REV |
| | 22 | OUTPUT_STRIP_TRAILING_WHITESPACE) |
| | 23 | if(ZIG_GIT_REV MATCHES "\\\\^0$") |
| | 24 | if(NOT("${ZIG_GIT_REV}" STREQUAL "${ZIG_VERSION}^0")) |
| | 25 | message("WARNING: Tag does not match configured Zig version") |
| | 26 | endif() |
| | 27 | else() |
| | 28 | set(ZIG_VERSION "${ZIG_VERSION_MAJOR}.${ZIG_VERSION_MINOR}.${ZIG_VERSION_PATCH}.${ZIG_GIT_REV}") |
| | 29 | endif() |
| | 30 | endif() |
| 15 | message("Configuring zig version ${ZIG_VERSION}") | 31 | message("Configuring zig version ${ZIG_VERSION}") |
| 16 | | 32 | |
| 17 | set(ZIG_LIBC_LIB_DIR "" CACHE STRING "Default native target libc directory where crt1.o can be found") | 33 | set(ZIG_LIBC_LIB_DIR "" CACHE STRING "Default native target libc directory where crt1.o can be found") |
Andrew Kelley <andrew@ziglang.org> 2017-10-01 18:34:22-04:00