gitmarker: fix cmake warning and don't append something w/o local changes

jef · jef · commit 12f2691a97ee · 2011-01-25T20:02:00.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15080 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -461,7 +461,7 @@ ELSE (SVN_MARKER)
     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}
       )
diff --git a/debian/rules b/debian/rules
@@ -22,7 +22,6 @@ GRASS_ABI=$(subst .,,$(shell pkg-config --modversion grass|sed -e "s/\.//g" -e "
 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 \

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ ELSE (SVN_MARKER)`
`461`	`461`	`IF(GIT)`
`462`	`462`	`ADD_CUSTOM_COMMAND(`
`463`	`463`	`OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h`
`464`		`- 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`
	`464`	`+ 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`
`465`	`465`	`MAIN_DEPENDENCY ${GIT_MARKER}`
`466`	`466`	`WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}`
`467`	`467`	`)`