diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2019-12-06 18:25:28 +0100 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2019-12-10 17:50:49 +0100 |
| commit | 3f21100e1d2ec47b64670a8b08d0c9d067bf9ef3 (patch) | |
| tree | 6774ce7f2bc020b646366503eaa6acf2f0af13eb /cmake | |
| parent | e8eda2c819b36555d9d6b080eaf8b4b1109d7646 (diff) | |
[HICN-430] Rework on CMake
Change way targets are defined: each project defines targets.
Fix project BUILD flags
Add build-extras bash script
Rework build tree of extras folder, using ExternalProject_Add
Change-Id: I82fa29896e54c8a033490eba013c3f0431bec9d0
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'cmake')
| -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) |