projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
b6eab22
)
Merge pull request #124 from siduction-upstream/master
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 1 Jul 2015 18:42:54 +0000
(20:42 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 1 Jul 2015 18:42:54 +0000
(20:42 +0200)
Fix read GIT_HEAD and GIT_DESCRIBE from environment
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
d873973
..
3028a42
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-570,10
+570,10
@@
git_describe(GIT_DESCRIBE --long)
# enviroment
if (NOT GIT_HEAD OR NOT GIT_DESCRIBE)
if (DEFINED ENV{GIT_HEAD})
- set(GIT_HEAD ${GIT_HEAD})
+ set(GIT_HEAD $
ENV
{GIT_HEAD})
endif ()
if (DEFINED ENV{GIT_DESCRIBE})
- set(GIT_DESCRIBE ${GIT_DESCRIBE})
+ set(GIT_DESCRIBE $
ENV
{GIT_DESCRIBE})
endif()
endif()