1 From cd591c10ab6f746d6dde0da3842efb4877581428 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
3 Date: Wed, 31 May 2017 14:33:09 +0200
4 Subject: [PATCH 2/6] cmake: disable version from git
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 as this recurses up the directory tree and gets wrong
10 information from the parent repository.
12 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
14 src/CMakeLists.txt | 5 -----
15 1 file changed, 5 deletions(-)
17 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
18 index c68c5fe..26c9a69 100644
19 --- a/src/CMakeLists.txt
20 +++ b/src/CMakeLists.txt
21 @@ -202,15 +202,10 @@ set(GCOV_PREFIX_STRIP 4)
23 option(ENABLE_GIT_VERSION "build Ceph with git version string" ON)
24 if(${ENABLE_GIT_VERSION})
25 - get_git_head_revision(GIT_REFSPEC CEPH_GIT_VER)
26 - git_describe(CEPH_GIT_NICE_VER --always)
27 - #if building from a source tarball via make-dist
28 - if(${CEPH_GIT_VER} STREQUAL "GITDIR-NOTFOUND")
29 message(STATUS "Ceph/.git directory not found, parsing ${CMAKE_CURRENT_SOURCE_DIR}/.git_version for CEPH_GIT_VER and CEPH_GIT_NICE_VER")
30 file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/.git_version CEPH_GIT_SHA_AND_TAG)
31 list(GET CEPH_GIT_SHA_AND_TAG 0 CEPH_GIT_VER)
32 list(GET CEPH_GIT_SHA_AND_TAG 1 CEPH_GIT_NICE_VER)
33 - endif(${CEPH_GIT_VER} STREQUAL "GITDIR-NOTFOUND")
34 # remove 'v' prefix from raw git version
35 string(SUBSTRING ${CEPH_GIT_NICE_VER} 1 -1 CEPH_GIT_NICE_VER)
36 else(${ENABLE_GIT_VERSION})