[QGIS Commit] r15080 - in trunk/qgis: . debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-01-25 12:02:00 -0800 (Tue, 25 Jan 2011)
New Revision: 15080

Modified:
   trunk/qgis/CMakeLists.txt
   trunk/qgis/debian/rules
Log:
gitmarker: fix cmake warning and don't append something w/o local changes

Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2011-01-25 18:57:12 UTC (rev 15079)
+++ trunk/qgis/CMakeLists.txt	2011-01-25 20:02:00 UTC (rev 15080)
@@ -461,7 +461,7 @@
     IF(GIT)
       ADD_CUSTOM_COMMAND(
         OUTPUT ${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' \)$$\( ${GIT} log --oneline $$\( ${GIT} log -n1 --grep='git-svn-id' --pretty=%H \).. | wc -l | sed -e 's/^/l+/' \)\\\" >${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' \)$$\( ${GIT} log --oneline $$\( ${GIT} log -n1 --grep='git-svn-id' --pretty=%H \).. | wc -l | sed -e 's/^/+/' -e 's/+0$$//' \)\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
         MAIN_DEPENDENCY ${GIT_MARKER}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       )

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2011-01-25 18:57:12 UTC (rev 15079)
+++ trunk/qgis/debian/rules	2011-01-25 20:02:00 UTC (rev 15080)
@@ -22,7 +22,6 @@
 GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
 
 CMAKE_OPTS := \
-	-Wno-dev \
 	-D GRASS_PREFIX=/usr/lib/grass64 \
 	-D CMAKE_INSTALL_PREFIX=/usr \
 	-D CMAKE_SKIP_RPATH=TRUE \