Skip to content

Commit f5137f5

Browse files
author
jef
committed
missed a directory in r13269
git-svn-id: http://svn.osgeo.org/qgis/trunk@13270 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent f2717b8 commit f5137f5

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

src/providers/spatialite/CMakeLists.txt

+13-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,19 @@ SET(SPATIALITE_MOC_HDRS qgsspatialiteprovider.h)
1212

1313
QT4_WRAP_CPP(SPATIALITE_MOC_SRCS ${SPATIALITE_MOC_HDRS})
1414

15-
INCLUDE_DIRECTORIES(
16-
../../core
17-
${SPATIALITE_INCLUDE_DIR}
18-
${GEOS_INCLUDE_DIR}
19-
)
15+
16+
INCLUDE_DIRECTORIES(../../core)
17+
18+
IF(WITH_INTERNAL_SPATIALITE)
19+
INCLUDE_DIRECTORIES(
20+
../core/spatialite/headers
21+
../core/spatialite/headers/spatialite
22+
)
23+
ELSE(WITH_INTERNAL_SPATIALITE)
24+
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
25+
ENDIF(WITH_INTERNAL_SPATIALITE)
26+
27+
INCLUDE_DIRECTORIES(${GEOS_INCLUDE_DIR})
2028

2129
ADD_LIBRARY (spatialiteprovider MODULE ${SPATIALITE_SRCS} ${SPATIALITE_MOC_SRCS})
2230

src/providers/spatialite/qgsspatialiteprovider.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ email : a.furieri@lqt.it
1616

1717
extern "C"
1818
{
19-
#include <spatialite/sqlite3.h>
19+
#include <sqlite3.h>
2020
#include <spatialite/gaiageo.h>
2121
#include <spatialite.h>
2222
}

0 commit comments

Comments
 (0)