[QGIS Commit] r15065 - trunk/qgis

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-01-22 04:45:19 -0800 (Sat, 22 Jan 2011)
New Revision: 15065

Modified:
   trunk/qgis/CMakeLists.txt
Log:
retrieve svn revision from git log instead of git svn info

Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2011-01-21 14:34:26 UTC (rev 15064)
+++ trunk/qgis/CMakeLists.txt	2011-01-22 12:45:19 UTC (rev 15065)
@@ -461,7 +461,7 @@
     IF(GIT)
       ADD_CUSTOM_COMMAND(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
-        COMMAND echo \\\#define QGSSVNVERSION \\\"`${GIT} svn info | sed -ne "s/Revision: //p"`\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
+        COMMAND echo \\\#define QGSSVNVERSION \\\"`${GIT} log -n1 --grep='git-svn-id' | sed -ne 's/^  *git-svn-id:.*@\([0-9]*\).*$\/\1/p'`\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
         MAIN_DEPENDENCY ${GIT_MARKER}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       )