Skip to content
Permalink
Browse files
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
  • Loading branch information
g_j_m committed Feb 6, 2007
1 parent 152cbca commit 75f408d0162b61e18f871e011fd21fc0511e6094
Showing with 3 additions and 1 deletion.
  1. +3 −1 CMakeLists.txt
@@ -129,6 +129,7 @@ IF (WIN32)
SET (QGIS_DATA_DIR ${CMAKE_INSTALL_PREFIX})
SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/plugins)
SET (QGIS_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})

ELSE (WIN32)

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


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

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

0 comments on commit 75f408d

Please sign in to comment.