From 514c6c11ae0039303617b3df8ae0e45e38199730 Mon Sep 17 00:00:00 2001
From: Marco Serantoni <marco.serantoni@gmail.com>
Date: Sat, 28 Dec 2013 12:29:20 +0100
Subject: [PATCH] =?UTF-8?q?Shows=20the=20current=20BZR=20version=20in=20ve?=
 =?UTF-8?q?rsion.h,=20not=20the=20last=20in=20the=20repository=20(Nick=20?=
 =?UTF-8?q?=C3=98stergaard)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeModules/CreateBzrVersionHeader.cmake | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CMakeModules/CreateBzrVersionHeader.cmake b/CMakeModules/CreateBzrVersionHeader.cmake
index a17a48ebda..5cafcf60bb 100644
--- a/CMakeModules/CreateBzrVersionHeader.cmake
+++ b/CMakeModules/CreateBzrVersionHeader.cmake
@@ -30,8 +30,15 @@ macro( create_bzr_version_header )
         set( _Bazaar_SAVED_LC_ALL "$ENV{LC_ALL}" )
         set( ENV{LC_ALL} C )
 
+        # Get the tree revison
         execute_process( COMMAND
-                         ${Bazaar_EXECUTABLE} log -r-1 ${PROJECT_SOURCE_DIR}
+                         ${Bazaar_EXECUTABLE} revno --tree ${PROJECT_SOURCE_DIR}
+                         OUTPUT_VARIABLE _bazaar_TREE_DATE
+                         OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+        # Get more info about that revision
+        execute_process( COMMAND
+                         ${Bazaar_EXECUTABLE} log -r${_bazaar_TREE_DATE} ${PROJECT_SOURCE_DIR}
                          OUTPUT_VARIABLE _bazaar_LAST_CHANGE_LOG
                          ERROR_VARIABLE _bazaar_log_error
                          RESULT_VARIABLE _bazaar_log_result