From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 1 Jul 2015 18:42:54 +0000 (+0200)
Subject: Merge pull request #124 from siduction-upstream/master
X-Git-Tag: travis-deploy-test~566
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=aa8806ebf3072b8cab8a8f2f32048f4cd3c1062e;hp=b6eab225596b412e64df8f531e8bf0b790e0b663

Merge pull request #124 from siduction-upstream/master

Fix read GIT_HEAD and GIT_DESCRIBE from environment
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8739738..3028a427 100644
--- 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()