]>
Commit | Line | Data |
---|---|---|
d10b51dc TL |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
2 | From: Thomas Lamprecht <t.lamprecht@proxmox.com> | |
3 | Date: Fri, 22 May 2020 15:54:24 +0200 | |
4 | Subject: [PATCH] cmake: disable version from git | |
5 | ||
6 | to avoid that the parent (packaging) git info is used.. | |
7 | ||
8 | Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> | |
9 | --- | |
e868ce26 | 10 | src/CMakeLists.txt | 7 ------- |
d10b51dc TL |
11 | 1 file changed, 7 deletions(-) |
12 | ||
13 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | |
e868ce26 | 14 | index e1f90f72b..185218554 100644 |
d10b51dc TL |
15 | --- a/src/CMakeLists.txt |
16 | +++ b/src/CMakeLists.txt | |
a653f20b | 17 | @@ -35,17 +35,10 @@ configure_file(ceph-crash.in |
d10b51dc TL |
18 | # we pull the git version from .git |
19 | option(ENABLE_GIT_VERSION "build Ceph with git version string" ON) | |
a653f20b | 20 | if(ENABLE_GIT_VERSION) |
d10b51dc TL |
21 | - get_git_head_revision(GIT_REFSPEC CEPH_GIT_VER) |
22 | - git_describe(CEPH_GIT_NICE_VER_WITH_V --always) | |
23 | - # remove leading 'v' | |
24 | - string(SUBSTRING ${CEPH_GIT_NICE_VER_WITH_V} 1 -1 CEPH_GIT_NICE_VER) | |
25 | - #if building from a source tarball via make-dist | |
26 | - if(${CEPH_GIT_VER} STREQUAL "GITDIR-NOTFOUND") | |
27 | message(STATUS "Ceph/.git directory not found, parsing ${CMAKE_CURRENT_SOURCE_DIR}/.git_version for CEPH_GIT_VER and CEPH_GIT_NICE_VER") | |
28 | file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/.git_version CEPH_GIT_SHA_AND_TAG) | |
29 | list(GET CEPH_GIT_SHA_AND_TAG 0 CEPH_GIT_VER) | |
30 | list(GET CEPH_GIT_SHA_AND_TAG 1 CEPH_GIT_NICE_VER) | |
31 | - endif(${CEPH_GIT_VER} STREQUAL "GITDIR-NOTFOUND") | |
a653f20b | 32 | else(ENABLE_GIT_VERSION) |
d10b51dc TL |
33 | set(CEPH_GIT_VER "no_version") |
34 | set(CEPH_GIT_NICE_VER "Development") |