Skip to content

Commit 75f408d

Browse files
author
g_j_m
committed
Fix for incorrect contents in qgssvnversion.h for Unix and Mac (was just
putting 'exported' instead of the actual subversion revision number) git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6536 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 152cbca commit 75f408d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ IF (WIN32)
129129
SET (QGIS_DATA_DIR ${CMAKE_INSTALL_PREFIX})
130130
SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/plugins)
131131
SET (QGIS_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
132+
SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
132133

133134
ELSE (WIN32)
134135

@@ -144,6 +145,7 @@ ELSE (WIN32)
144145
SET (QGIS_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/qgis)
145146
SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
146147
SET(QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
148+
SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
147149

148150

149151
IF (UNIX AND NOT APPLE)
@@ -192,7 +194,7 @@ IF (WIN32)
192194
ELSE (WIN32)
193195

194196
ADD_CUSTOM_TARGET(svnversion ALL
195-
QGSSVNDEF='\#define QGSSVNVERSION \"'`svnversion .`'\"' &&
197+
QGSSVNDEF='\#define QGSSVNVERSION \"'`svnversion ${QGIS_SOURCE_DIR}`'\"' &&
196198
if [ \"`grep QGSSVNVERSION qgssvnversion.h 2>/dev/null`\" != \"$$QGSSVNDEF\" ]; then
197199
echo $$QGSSVNDEF > qgssvnversion.h \; fi
198200
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})

0 commit comments

Comments
 (0)