[QGIS Commit] r13254 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-04-05 14:30:50 -0400 (Mon, 05 Apr 2010)
New Revision: 13254

Modified:
   trunk/qgis/src/app/CMakeLists.txt
Log:
Fixed compilation with internal spatialite
(src/core/spatialite/headers/spatialite/spatialite.h was shadowing the wanted src/core/spatialite/headers/spatialite.h)


Modified: trunk/qgis/src/app/CMakeLists.txt
===================================================================
--- trunk/qgis/src/app/CMakeLists.txt	2010-04-05 17:20:30 UTC (rev 13253)
+++ trunk/qgis/src/app/CMakeLists.txt	2010-04-05 18:30:50 UTC (rev 13254)
@@ -330,19 +330,17 @@
   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)
 
 #############