]>
Commit | Line | Data |
---|---|---|
cd7bc3b1 | 1 | From c6af60a05ac7da38ad71d5f7a2093bde318b976d Mon Sep 17 00:00:00 2001 |
e841ecd4 FG |
2 | From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com> |
3 | Date: Wed, 31 May 2017 14:33:09 +0200 | |
35fef7f4 | 4 | Subject: [PATCH 2/3] cmake: disable version from git |
e841ecd4 FG |
5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | as this recurses up the directory tree and gets wrong | |
10 | information from the parent repository. | |
11 | ||
12 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
13 | --- | |
14 | src/CMakeLists.txt | 5 ----- | |
15 | 1 file changed, 5 deletions(-) | |
16 | ||
17 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | |
cd7bc3b1 | 18 | index 5060b41bc2..5d57712a44 100644 |
e841ecd4 FG |
19 | --- a/src/CMakeLists.txt |
20 | +++ b/src/CMakeLists.txt | |
35fef7f4 FG |
21 | @@ -206,15 +206,10 @@ set(GCOV_PREFIX_STRIP 4) |
22 | # we pull the git version from .git | |
e841ecd4 FG |
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}) | |
37 | -- | |
35fef7f4 | 38 | 2.11.0 |
e841ecd4 | 39 |