diff options
| author | Jay Petacat <jay@jayschwa.net> | 2020-12-29 20:35:47 -0600 |
|---|---|---|
| committer | Jay Petacat <jay@jayschwa.net> | 2020-12-29 23:25:58 -0600 |
| commit | 4af763d401b48f7186650335c8e42e8fe29751bf (patch) | |
| tree | 1d7738e9271540b145be4fb4eb5dfa79d194ce1a /CMakeLists.txt | |
| parent | 3634d44d08c73326c7783cf2a3095acb50eb2e1c (diff) | |
| download | zig-4af763d401b48f7186650335c8e42e8fe29751bf.tar.gz zig-4af763d401b48f7186650335c8e42e8fe29751bf.zip | |
stage2: SemVer compliance for development builds
This matches the behavior of CMake builds. These changes should have
been in PR #6509, but were missed.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e023777dd9..c74ba7fca8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ if("${ZIG_VERSION}" STREQUAL "") # Tagged release version. set(GIT_TAG ${CMAKE_MATCH_1}) if(NOT GIT_TAG VERSION_EQUAL ZIG_VERSION) - message(SEND_ERROR "Configured Zig version (${ZIG_VERSION}) does not match Git tag (${GIT_TAG}).") + message(SEND_ERROR "Zig version (${ZIG_VERSION}) does not match Git tag (${GIT_TAG}).") endif() elseif(GIT_DESCRIBE MATCHES "^v?([0-9]+\\.[0-9]+\\.[0-9]+)-([0-9]+)-(.+)$") # Untagged pre-release. The Zig version is updated to include the number of commits @@ -54,7 +54,7 @@ if("${ZIG_VERSION}" STREQUAL "") set(GIT_COMMITS_AFTER_TAG ${CMAKE_MATCH_2}) set(GIT_COMMIT ${CMAKE_MATCH_3}) if(NOT ZIG_VERSION VERSION_GREATER GIT_TAG) - message(SEND_ERROR "Configured Zig version (${ZIG_VERSION}) must be greater than tagged ancestor (${GIT_TAG}).") + message(SEND_ERROR "Zig version (${ZIG_VERSION}) must be greater than tagged ancestor (${GIT_TAG}).") endif() set(ZIG_VERSION "${ZIG_VERSION}-dev.${GIT_COMMITS_AFTER_TAG}+${GIT_COMMIT}") else() |