Skip to content

Commit ff61f65

Browse files
author
wonder
committed
Fixed compilation with internal spatialite
(src/core/spatialite/headers/spatialite/spatialite.h was shadowing the wanted src/core/spatialite/headers/spatialite.h) git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13254 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 53d3ab7 commit ff61f65

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/app/CMakeLists.txt

+5-7
Original file line numberDiff line numberDiff line change
@@ -330,19 +330,17 @@ INCLUDE_DIRECTORIES(
330330
gps/qwtpolar
331331
)
332332

333-
IF (WITH_INTERNAL_SPATIALITE)
334-
INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
335-
ELSE (WITH_INTERNAL_SPATIALITE)
336-
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
337-
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
338-
ENDIF (WITH_INTERNAL_SPATIALITE)
339-
340333
IF (POSTGRES_FOUND)
341334
INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
342335
ENDIF (POSTGRES_FOUND)
343336

344337
IF (HAVE_SPATIALITE)
345338
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
339+
340+
IF (NOT WITH_INTERNAL_SPATIALITE)
341+
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
342+
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
343+
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
346344
ENDIF (HAVE_SPATIALITE)
347345

348346
#############

0 commit comments

Comments
 (0)