Skip to content
Permalink
Browse files
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
  • Loading branch information
wonder committed Apr 5, 2010
1 parent 53d3ab7 commit ff61f65d2aab0c82eb5a9a1167f6d0980c2ebd81
Showing with 5 additions and 7 deletions.
  1. +5 −7 src/app/CMakeLists.txt
@@ -330,19 +330,17 @@ INCLUDE_DIRECTORIES(
gps/qwtpolar
)

IF (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
ELSE (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
ENDIF (WITH_INTERNAL_SPATIALITE)

IF (POSTGRES_FOUND)
INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
ENDIF (POSTGRES_FOUND)

IF (HAVE_SPATIALITE)
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})

IF (NOT WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
ENDIF (HAVE_SPATIALITE)

#############

0 comments on commit ff61f65

Please sign in to comment.