Make QSPATIALITE optional, but still include it in osgeo4w and debian…

… package
qgis · Feb 19, 2013 · 24ba638 · 24ba638
1 parent 9768b13
commit 24ba638
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,7 +61,7 @@ SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support shou
 IF (WITH_SPATIALITE)
   SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
   SET (WITH_PYSPATIALITE FALSE CACHE BOOL "Determines whether PYSPATIALITE should be built")
-  SET (WITH_QSPATIALITE TRUE CACHE BOOL "Determines whether QSPATIALITE sql driver should be built")
+  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)

diff --git a/debian/changelog b/debian/changelog
@@ -11,9 +11,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
   * add python-psycopg2 and python-qscintilla2 dependency to python-qgis
   * add support for ubuntu quantal and raring
   * remove js files and add libjs-jquery/libjs-underscore dependency
-  * temporarily disable mssql provider until migrated to new vector api.
+  * add spatialite qt sql driver
 
- -- Jürgen E. Fischer <jef@norbit.de>  Thu, 31 Jan 2013 13:34:24 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Tue, 19 Feb 2013 20:05:55 +0100
 
 qgis (1.8.0) UNRELEASED; urgency=low
 

diff --git a/debian/qgis-providers.install.in b/debian/qgis-providers.install.in
@@ -12,4 +12,4 @@ usr/lib/qgis/plugins/libspatialiteprovider.so
 usr/lib/qgis/plugins/libwfsprovider.so
 usr/lib/qgis/plugins/libwmsprovider.so
 usr/lib/qgis/plugins/libwcsprovider.so
-usr/lib/{DEB_BUILD_GNU_TYPE}/qt4/plugins/sqldrivers/libqsqlspatialite.so
+{QT_PLUGIN_DIR}/sqldrivers/libqsqlspatialite.so
diff --git a/debian/rules b/debian/rules
@@ -47,12 +47,19 @@ CMAKE_OPTS := \
 	-D BINDINGS_GLOBAL_INSTALL=TRUE \
 	-D PEDANTIC=TRUE \
 	-D WITH_SPATIALITE=TRUE \
+	-D WITH_QSPATIALITE=TRUE \
 	-D WITH_MAPSERVER=TRUE \
 	-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
 	-D WITH_APIDOC=TRUE
 
 MAKEFLAGS += VERBOSE=YES
 
+ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
+	QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_GNU_TYPE)/qt4/plugins
+else
+	QT_PLUGIN_DIR = usr/lib/qt4/plugins
+endif
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
          NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
          MAKEFLAGS += -j$(NUMJOBS)
@@ -118,6 +125,7 @@ define gentemplate
 $(2): $(1)
 	sed \
 		-e "s/{DEB_BUILD_GNU_TYPE}/$(DEB_BUILD_GNU_TYPE)/g" \
+		-e "s/{QT_PLUGIN_DIR}/$(QT_PLUGIN_DIR)/g" \
 		-e "s/{QGIS_ABI}/$(QGIS_ABI)/g" \
 		-e "s/{GRASS}/$(GRASS)/g" \
 		-e "s/{GRASS_ABI}/$(GRASS_ABI)/g" $$^ >$$@

diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -108,6 +108,7 @@ cmake -G "Visual Studio 9 2008" ^
 	-D SITE="qgis.org" ^
 	-D PEDANTIC=TRUE ^
 	-D WITH_SPATIALITE=TRUE ^
+	-D WITH_QSPATIALITE=TRUE ^
 	-D WITH_MAPSERVER=TRUE ^
 	-D WITH_ASTYLE=TRUE ^
 	-D WITH_GLOBE=TRUE ^

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -105,6 +105,7 @@ set GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS_VERSION%
 cmake -G "Visual Studio 9 2008" ^
 	-D PEDANTIC=TRUE ^
 	-D WITH_SPATIALITE=TRUE ^
+	-D WITH_QSPATIALITE=TRUE ^
 	-D WITH_MAPSERVER=TRUE ^
 	-D WITH_GLOBE=TRUE ^
 	-D WITH_TOUCH=TRUE ^