diff options
| author |   Luca Muscariello <muscariello@ieee.org> | 2019-12-11 09:41:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-12-11 09:41:02 +0000 |
| commit | 745726e5c84c2c70e67d2372c965034aa63791ba (patch) | |
| tree | ef46bbe1dbe3669c122d841f07b6fcd1c858cc45 /cmake/Modules | |
| parent | 2f8f60f943b71e1caab14856c6a03c81e5ba6c9c (diff) | |
| parent | 3f21100e1d2ec47b64670a8b08d0c9d067bf9ef3 (diff) | |
Merge "[HICN-430] Rework on CMake"
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/Packager.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake index 56221fcca..fdda9a203 100644 --- a/cmake/Modules/Packager.cmake +++ b/cmake/Modules/Packager.cmake @@ -55,7 +55,7 @@ macro(extract_version) message(STATUS "Git describe output: ${VER}") - string(REGEX REPLACE "v([0-9]+).([0-9]+)-([0-9]+)-(g[0-9a-f]+)" "\\1;\\2;\\3;\\4" VER ${VER}) + string(REGEX REPLACE "v([0-9]+).([0-9]+).*-([0-9]+)-(g[0-9a-f]+)" "\\1;\\2;\\3;\\4" VER ${VER}) list(GET VER 0 VERSION_MAJOR) list(GET VER 1 VERSION_MINOR) list(GET VER 2 VERSION_REVISION) |