several components require spatialite, make it required (fixes #8797)

Author: jef-n

CMakeLists.txt

@@ -66,7 +66,6 @@ SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE su
 SET (WITH_QSPATIALITE FALSE CACHE BOOL "Determines whether QSPATIALITE sql driver should be built")
 IF(WITH_INTERNAL_SPATIALITE)
   SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
-  SET(HAVE_SPATIALITE TRUE)
   IF(WIN32 OR APPLE OR CYGWIN)
     FIND_PACKAGE(Iconv REQUIRED)
   ENDIF(WIN32 OR APPLE OR CYGWIN)
@@ -199,7 +198,7 @@ IF (WITH_POSTGRESQL)
 ENDIF (WITH_POSTGRESQL)
 
 IF (NOT WITH_INTERNAL_SPATIALITE)
-  FIND_PACKAGE(SPATIALITE)
+  FIND_PACKAGE(SPATIALITE REQUIRED)
 ENDIF (NOT WITH_INTERNAL_SPATIALITE)
 
 IF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
@@ -211,10 +210,8 @@ IF (POSTGRES_FOUND)
   SET (HAVE_POSTGRESQL TRUE)
 ENDIF (POSTGRES_FOUND)
 
-IF (SPATIALITE_FOUND)
-  # following variable is used in qgsconfig.h
-  SET (HAVE_SPATIALITE TRUE)
-ENDIF (SPATIALITE_FOUND)
+# following variable is used in qgsconfig.h
+SET (HAVE_SPATIALITE TRUE)
 
 # following variable is used in qgsconfig.h
 SET (HAVE_MSSQL TRUE)

src/providers/CMakeLists.txt

@@ -13,6 +13,7 @@ ADD_SUBDIRECTORY(ows)
 ADD_SUBDIRECTORY(wcs)
 ADD_SUBDIRECTORY(gpx)
 ADD_SUBDIRECTORY(wfs)
+ADD_SUBDIRECTORY(spatialite)
 
 IF (WITH_ORACLE)
   ADD_SUBDIRECTORY(oracle)
@@ -22,10 +23,6 @@ IF (POSTGRES_FOUND)
   ADD_SUBDIRECTORY(postgres)
 ENDIF (POSTGRES_FOUND)
 
-IF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
-  ADD_SUBDIRECTORY(spatialite)
-ENDIF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
-
 IF (GRASS_FOUND)
   ADD_SUBDIRECTORY(grass)
 ENDIF (GRASS_FOUND)