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@13254 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 5, 2010 · 58ebc4f · 58ebc4f
1 parent b5465e0
commit 58ebc4f
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/app/CMakeLists.txt b/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)
 
 #############