Skip to content

Commit 1f120e0

Browse files
committed
Fix #54
1 parent 7c1dd22 commit 1f120e0

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ set(META_VERSION_PATCH "0")
6060
set(META_VERSION_REVISION "${GIT_REV}")
6161
set(META_VERSION "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
6262
set(META_NAME_VERSION "${META_PROJECT_NAME} v${META_VERSION} (${META_VERSION_REVISION})")
63-
set(META_CMAKE_INIT_SHA "${GIT_SHA1}")
63+
set(META_CMAKE_INIT_SHA "${GIT_REV}")
6464

6565
string(MAKE_C_IDENTIFIER ${META_PROJECT_NAME} META_PROJECT_ID)
6666
string(TOUPPER ${META_PROJECT_ID} META_PROJECT_ID)

cmake/GetGitRevisionDescription.cmake.in

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
# http://www.boost.org/LICENSE_1_0.txt)
1515

1616
set(HEAD_HASH)
17+
set(HEAD_REF)
18+
19+
if (NOT EXISTS "@HEAD_FILE@")
20+
return()
21+
endif()
1722

1823
file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
1924

@@ -23,7 +28,7 @@ if(HEAD_CONTENTS MATCHES "ref")
2328
string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
2429
if(EXISTS "@GIT_DIR@/${HEAD_REF}")
2530
configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
26-
else()
31+
elseif(EXISTS "@GIT_DIR@/packed-refs")
2732
configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
2833
file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
2934
if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
@@ -35,7 +40,7 @@ else()
3540
configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
3641
endif()
3742

38-
if(NOT HEAD_HASH)
43+
if(NOT HEAD_HASH AND EXISTS "@GIT_DATA@/head-ref")
3944
file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
4045
string(STRIP "${HEAD_HASH}" HEAD_HASH)
4146
endif()

0 commit comments

Comments
 (0)