wfs in core needs expat

Author: jef-n

CMakeLists.txt

@@ -161,7 +161,7 @@ ENDIF(NOT WIN32 AND NOT ANDROID)
 FIND_PACKAGE(Proj)
 FIND_PACKAGE(GEOS)
 FIND_PACKAGE(GDAL)
-FIND_PACKAGE(Expat)
+FIND_PACKAGE(Expat REQUIRED)
 FIND_PACKAGE(Spatialindex REQUIRED)
 FIND_PACKAGE(Qwt REQUIRED)
 

doc/overview.t2t

@@ -21,14 +21,15 @@ Required build deps:
 - Sqlite3 >= 3.0.0
 - GDAL/OGR >= 1.4.x
 - Qwt >= 5.0
+- expat >= 1.95
 -
 
 Optional dependencies:
 
 - for GRASS plugin - GRASS >= 6.0.0 (libraries compiled with exceptions support on Linux 32bit)
 - for georeferencer - GSL >= 1.8
 - for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
-- for gps plugin - expat >= 1.95 and gpsbabel
+- for gps plugin - gpsbabel
 - for mapserver export and PyQGIS - Python >= 2.3 (2.5+ preferred)
 - for python support - SIP >= 4.8, PyQt >= must match Qt version, Qscintilla2
 - for qgis mapserver - FastCGI

src/core/CMakeLists.txt

@@ -590,6 +590,7 @@ TARGET_LINK_LIBRARIES(qgis_core
   ${GEOS_LIBRARY}
   ${GDAL_LIBRARY}
   ${SPATIALINDEX_LIBRARY}
+  ${EXPAT_LIBRARY}
 )
 
 IF (WITH_INTERNAL_SPATIALITE)

src/plugins/CMakeLists.txt

@@ -15,6 +15,7 @@ ADD_SUBDIRECTORY(sqlanywhere)
 ADD_SUBDIRECTORY(roadgraph)
 ADD_SUBDIRECTORY(zonal_statistics)
 ADD_SUBDIRECTORY(georeferencer)
+ADD_SUBDIRECTORY(gps_importer)
 
 IF (WITH_SPATIALITE)
   ADD_SUBDIRECTORY(offline_editing)
@@ -28,10 +29,6 @@ IF (GRASS_FOUND)
   ADD_SUBDIRECTORY(grass)
 ENDIF (GRASS_FOUND)
 
-IF (EXPAT_FOUND)
-ADD_SUBDIRECTORY(gps_importer)
-ENDIF (EXPAT_FOUND)
-
 IF (WITH_GLOBE)
   ADD_SUBDIRECTORY(globe)
 ENDIF (WITH_GLOBE)

src/providers/CMakeLists.txt

@@ -12,6 +12,8 @@ ADD_SUBDIRECTORY(gdal)
 ADD_SUBDIRECTORY(mssql)
 ADD_SUBDIRECTORY(ows)
 ADD_SUBDIRECTORY(wcs)
+ADD_SUBDIRECTORY(gpx)
+ADD_SUBDIRECTORY(wfs)
 
 IF (POSTGRES_FOUND)
   ADD_SUBDIRECTORY(postgres)
@@ -21,11 +23,6 @@ IF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
   ADD_SUBDIRECTORY(spatialite)
 ENDIF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
 
-IF (EXPAT_FOUND)
-  ADD_SUBDIRECTORY(gpx)
-  ADD_SUBDIRECTORY(wfs)
-ENDIF (EXPAT_FOUND)
-
 IF (GRASS_FOUND)
   ADD_SUBDIRECTORY(grass)
 ENDIF (GRASS_FOUND)