[QGIS Commit] r13271 - in trunk/qgis/src: app providers/spatialite

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-04-06 19:45:50 -0400 (Tue, 06 Apr 2010)
New Revision: 13271

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/providers/spatialite/CMakeLists.txt
Log:
show PostgreSQL and SpatiaLite version in about

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-04-06 23:03:16 UTC (rev 13270)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-04-06 23:45:50 UTC (rev 13271)
@@ -211,7 +211,12 @@
 //
 #ifdef HAVE_POSTGRESQL
 #include "postgres/qgspgsourceselect.h"
+#ifdef HAVE_PGCONFIG
+#include <pg_config.h>
+#else
+#define PG_VERSION "unknown"
 #endif
+#endif
 #ifdef HAVE_SPATIALITE
 extern "C"
 {
@@ -2353,13 +2358,13 @@
                             .arg( QGis::QGIS_VERSION )
                             .arg( QGis::QGIS_SVN_VERSION );
 #ifdef HAVE_POSTGRESQL
-    versionString += tr( "\nThis copy of QGIS has been built with PostgreSQL support." );
+    versionString += tr( "\nThis copy of QGIS has been built with PostgreSQL support (%1)." ).arg( PG_VERSION );
 #else
     versionString += tr( "\nThis copy of QGIS has been built without PostgreSQL support." );
 #endif
 
 #ifdef HAVE_SPATIALITE
-    versionString += tr( "\nThis copy of QGIS has been built with SpatiaLite support." );
+    versionString += tr( "\nThis copy of QGIS has been built with SpatiaLite support (%1)." ).arg( spatialite_version() );
 #else
     versionString += tr( "\nThis copy of QGIS has been built without SpatiaLite support." );
 #endif

Modified: trunk/qgis/src/providers/spatialite/CMakeLists.txt
===================================================================
--- trunk/qgis/src/providers/spatialite/CMakeLists.txt	2010-04-06 23:03:16 UTC (rev 13270)
+++ trunk/qgis/src/providers/spatialite/CMakeLists.txt	2010-04-06 23:45:50 UTC (rev 13271)
@@ -17,8 +17,8 @@
 
 IF(WITH_INTERNAL_SPATIALITE)
   INCLUDE_DIRECTORIES(
-    ../core/spatialite/headers
-    ../core/spatialite/headers/spatialite
+    ../../core/spatialite/headers
+    ../../core/spatialite/headers/spatialite
   )
 ELSE(WITH_INTERNAL_SPATIALITE)
   INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})