[QGIS Commit] r13270 - trunk/qgis/src/providers/spatialite

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-04-06 19:03:16 -0400 (Tue, 06 Apr 2010)
New Revision: 13270

Modified:
   trunk/qgis/src/providers/spatialite/CMakeLists.txt
   trunk/qgis/src/providers/spatialite/qgsspatialiteprovider.h
Log:
missed a directory in r13269

Modified: trunk/qgis/src/providers/spatialite/CMakeLists.txt
===================================================================
--- trunk/qgis/src/providers/spatialite/CMakeLists.txt	2010-04-06 22:25:12 UTC (rev 13269)
+++ trunk/qgis/src/providers/spatialite/CMakeLists.txt	2010-04-06 23:03:16 UTC (rev 13270)
@@ -12,12 +12,20 @@
 
 QT4_WRAP_CPP(SPATIALITE_MOC_SRCS ${SPATIALITE_MOC_HDRS})
 
-INCLUDE_DIRECTORIES(
-  ../../core
-  ${SPATIALITE_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
-)
 
+INCLUDE_DIRECTORIES(../../core)
+
+IF(WITH_INTERNAL_SPATIALITE)
+  INCLUDE_DIRECTORIES(
+    ../core/spatialite/headers
+    ../core/spatialite/headers/spatialite
+  )
+ELSE(WITH_INTERNAL_SPATIALITE)
+  INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
+ENDIF(WITH_INTERNAL_SPATIALITE)
+
+INCLUDE_DIRECTORIES(${GEOS_INCLUDE_DIR})
+
 ADD_LIBRARY (spatialiteprovider MODULE ${SPATIALITE_SRCS} ${SPATIALITE_MOC_SRCS})
 
 TARGET_LINK_LIBRARIES(spatialiteprovider

Modified: trunk/qgis/src/providers/spatialite/qgsspatialiteprovider.h
===================================================================
--- trunk/qgis/src/providers/spatialite/qgsspatialiteprovider.h	2010-04-06 22:25:12 UTC (rev 13269)
+++ trunk/qgis/src/providers/spatialite/qgsspatialiteprovider.h	2010-04-06 23:03:16 UTC (rev 13270)
@@ -16,7 +16,7 @@
 
 extern "C"
 {
-#include <spatialite/sqlite3.h>
+#include <sqlite3.h>
 #include <spatialite/gaiageo.h>
 #include <spatialite.h>
 }