[QGIS Commit] r14337 - trunk/qgis/src/plugins/offline_editing

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-10-05 09:29:16 +0000 (Tue, 05 Oct 2010)
New Revision: 14337

Modified:
   trunk/qgis/src/plugins/offline_editing/CMakeLists.txt
   trunk/qgis/src/plugins/offline_editing/offline_editing.h
Log:
fix windows build

Modified: trunk/qgis/src/plugins/offline_editing/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/offline_editing/CMakeLists.txt	2010-10-05 09:21:43 UTC (rev 14336)
+++ trunk/qgis/src/plugins/offline_editing/CMakeLists.txt	2010-10-05 09:29:16 UTC (rev 14337)
@@ -34,12 +34,21 @@
 
 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

Modified: trunk/qgis/src/plugins/offline_editing/offline_editing.h
===================================================================
--- trunk/qgis/src/plugins/offline_editing/offline_editing.h	2010-10-05 09:21:43 UTC (rev 14336)
+++ trunk/qgis/src/plugins/offline_editing/offline_editing.h	2010-10-05 09:29:16 UTC (rev 14337)
@@ -29,7 +29,7 @@
 class QgsMapLayer;
 class QgsOfflineEditingProgressDialog;
 class QgsVectorLayer;
-class sqlite3;
+struct sqlite3;
 
 class QgsOfflineEditing : public QObject
 {