Skip to content

Commit f2cbc2b

Browse files
author
jef
committed
fix windows build
git-svn-id: http://svn.osgeo.org/qgis/trunk@14337 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b810ad6 commit f2cbc2b

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/plugins/offline_editing/CMakeLists.txt

+10-1
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,21 @@ QT4_ADD_RESOURCES(offline_editing_plugin_RCC_SRCS ${offline_editing_plugin_RCCS}
3434

3535
ADD_LIBRARY (offlineeditingplugin MODULE ${offline_editing_plugin_SRCS} ${offline_editing_plugin_MOC_SRCS} ${offline_editing_plugin_RCC_SRCS} ${offline_editing_plugin_UIS_H})
3636

37+
IF (WITH_INTERNAL_SPATIALITE)
38+
INCLUDE_DIRECTORIES(../../core/spatialite/headers)
39+
INCLUDE_DIRECTORIES(../../core/spatialite/headers/spatialite)
40+
ELSE (WITH_INTERNAL_SPATIALITE)
41+
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
42+
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
43+
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
44+
ENDIF (WITH_INTERNAL_SPATIALITE)
45+
3746
INCLUDE_DIRECTORIES(
3847
${CMAKE_CURRENT_BINARY_DIR}
39-
${SQLITE3_INCLUDE_DIR} ${SPATIALITE_INCLUDE_DIR}
4048
../../core ../../core/raster ../../core/renderer ../../core/symbology
4149
../../gui
4250
..
51+
${GEOS_INCLUDE_DIR}
4352
)
4453

4554
TARGET_LINK_LIBRARIES(offlineeditingplugin

src/plugins/offline_editing/offline_editing.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class QgsLegendInterface;
2929
class QgsMapLayer;
3030
class QgsOfflineEditingProgressDialog;
3131
class QgsVectorLayer;
32-
class sqlite3;
32+
struct sqlite3;
3333

3434
class QgsOfflineEditing : public QObject
3535
{

0 commit comments

Comments
 (0)