fix windows build

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14337 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Oct 5, 2010 · 4dd7664 · 4dd7664
1 parent 815b4c7
commit 4dd7664
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/plugins/offline_editing/CMakeLists.txt b/src/plugins/offline_editing/CMakeLists.txt
@@ -34,12 +34,21 @@ QT4_ADD_RESOURCES(offline_editing_plugin_RCC_SRCS ${offline_editing_plugin_RCCS}
 
 ADD_LIBRARY (offlineeditingplugin MODULE ${offline_editing_plugin_SRCS} ${offline_editing_plugin_MOC_SRCS} ${offline_editing_plugin_RCC_SRCS} ${offline_editing_plugin_UIS_H})
 
+IF (WITH_INTERNAL_SPATIALITE)
+  INCLUDE_DIRECTORIES(../../core/spatialite/headers)
+  INCLUDE_DIRECTORIES(../../core/spatialite/headers/spatialite)
+ELSE (WITH_INTERNAL_SPATIALITE)
+  INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
+  ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
+ENDIF (WITH_INTERNAL_SPATIALITE)
+
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
-     ${SQLITE3_INCLUDE_DIR} ${SPATIALITE_INCLUDE_DIR}
      ../../core ../../core/raster ../../core/renderer ../../core/symbology
      ../../gui
      ..
+     ${GEOS_INCLUDE_DIR}
 )
 
 TARGET_LINK_LIBRARIES(offlineeditingplugin

diff --git a/src/plugins/offline_editing/offline_editing.h b/src/plugins/offline_editing/offline_editing.h
@@ -29,7 +29,7 @@ class QgsLegendInterface;
 class QgsMapLayer;
 class QgsOfflineEditingProgressDialog;
 class QgsVectorLayer;
-class sqlite3;
+struct sqlite3;
 
 class QgsOfflineEditing : public QObject
 {