[QGIS Commit] r13269 - in trunk/qgis: python src/app src/gui

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-04-06 18:25:12 -0400 (Tue, 06 Apr 2010)
New Revision: 13269

Modified:
   trunk/qgis/python/CMakeLists.txt
   trunk/qgis/src/app/CMakeLists.txt
   trunk/qgis/src/app/qgsspatialitesourceselect.h
   trunk/qgis/src/gui/CMakeLists.txt
Log:
fix windows build

Modified: trunk/qgis/python/CMakeLists.txt
===================================================================
--- trunk/qgis/python/CMakeLists.txt	2010-04-06 20:32:19 UTC (rev 13268)
+++ trunk/qgis/python/CMakeLists.txt	2010-04-06 22:25:12 UTC (rev 13269)
@@ -1,6 +1,11 @@
-
 SUBDIRS(plugins)
 
+IF (WITH_INTERNAL_SPATIALITE)
+  INCLUDE_DIRECTORIES(
+    ../src/core/spatialite/headers
+    ../src/core/spatialite/headers/spatialite
+  )
+ENDIF (WITH_INTERNAL_SPATIALITE)
 
 INCLUDE_DIRECTORIES(
     ${PYTHON_INCLUDE_PATH}

Modified: trunk/qgis/src/app/CMakeLists.txt
===================================================================
--- trunk/qgis/src/app/CMakeLists.txt	2010-04-06 20:32:19 UTC (rev 13268)
+++ trunk/qgis/src/app/CMakeLists.txt	2010-04-06 22:25:12 UTC (rev 13269)
@@ -317,9 +317,6 @@
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
   ${QT_QTUITOOLS_INCLUDE_DIR}
-  ${PROJ_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
-  ${GDAL_INCLUDE_DIR}
   ../core
   ../core/gps ../core/gps/qextserialport
   ../core/composer ../core/raster ../core/renderer ../core/symbology ../core/symbology-ng
@@ -330,19 +327,27 @@
   gps/qwtpolar
   )
 
-IF (POSTGRES_FOUND)
-  INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
-ENDIF (POSTGRES_FOUND)
-
 IF (HAVE_SPATIALITE)
-  INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
-
-  IF (NOT WITH_INTERNAL_SPATIALITE)
+  IF (WITH_INTERNAL_SPATIALITE)
+    INCLUDE_DIRECTORIES(../core/spatialite/headers)
+    INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
+  ELSE (WITH_INTERNAL_SPATIALITE)
+    INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
     INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
     ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
-  ENDIF (NOT WITH_INTERNAL_SPATIALITE)
+  ENDIF (WITH_INTERNAL_SPATIALITE)
 ENDIF (HAVE_SPATIALITE)
 
+INCLUDE_DIRECTORIES(
+  ${PROJ_INCLUDE_DIR}
+  ${GEOS_INCLUDE_DIR}
+  ${GDAL_INCLUDE_DIR}
+)
+
+IF (POSTGRES_FOUND)
+  INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
+ENDIF (POSTGRES_FOUND)
+
 #############
 
 IF (WIN32)

Modified: trunk/qgis/src/app/qgsspatialitesourceselect.h
===================================================================
--- trunk/qgis/src/app/qgsspatialitesourceselect.h	2010-04-06 20:32:19 UTC (rev 13268)
+++ trunk/qgis/src/app/qgsspatialitesourceselect.h	2010-04-06 22:25:12 UTC (rev 13269)
@@ -25,7 +25,7 @@
 
 extern "C"
 {
-#include <spatialite/sqlite3.h>
+#include <sqlite3.h>
 }
 
 #include <QThread>

Modified: trunk/qgis/src/gui/CMakeLists.txt
===================================================================
--- trunk/qgis/src/gui/CMakeLists.txt	2010-04-06 20:32:19 UTC (rev 13268)
+++ trunk/qgis/src/gui/CMakeLists.txt	2010-04-06 22:25:12 UTC (rev 13269)
@@ -95,25 +95,27 @@
 QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
 
 INCLUDE_DIRECTORIES(
-${QT_QTUITOOLS_INCLUDE_DIR}
-${CMAKE_CURRENT_SOURCE_DIR}
-${CMAKE_CURRENT_SOURCE_DIR}/symbology-ng
-../core
-../core/composer
-../core/raster
-../core/renderer
-../core/symbology
-../core/symbology-ng
-${CMAKE_CURRENT_BINARY_DIR}
-${CMAKE_CURRENT_BINARY_DIR}/../ui
-${GEOS_INCLUDE_DIR}
+  ${QT_QTUITOOLS_INCLUDE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/symbology-ng
+  ../core
+  ../core/composer
+  ../core/raster
+  ../core/renderer
+  ../core/symbology
+  ../core/symbology-ng
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/../ui
 )
 IF (WITH_INTERNAL_SPATIALITE)
+  INCLUDE_DIRECTORIES(../core/spatialite/headers)
   INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
 ELSE (WITH_INTERNAL_SPATIALITE)
   INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
 ENDIF (WITH_INTERNAL_SPATIALITE)
 
+INCLUDE_DIRECTORIES(${GEOS_INCLUDE_DIR})
+
 IF (WIN32)
   IF (MSVC)
     ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllexport)")