missed a directory in r13269

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13270 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 6, 2010 · 52d9463 · 52d9463
1 parent 8d76b51
commit 52d9463
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/providers/spatialite/CMakeLists.txt b/src/providers/spatialite/CMakeLists.txt
@@ -12,11 +12,19 @@ SET(SPATIALITE_MOC_HDRS qgsspatialiteprovider.h)
 
 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})
 

diff --git a/src/providers/spatialite/qgsspatialiteprovider.h b/src/providers/spatialite/qgsspatialiteprovider.h
@@ -16,7 +16,7 @@ email                : a.furieri@lqt.it
 
 extern "C"
 {
-#include <spatialite/sqlite3.h>
+#include <sqlite3.h>
 #include <spatialite/gaiageo.h>
 #include <spatialite.h>
 }