introduce MAPSERVER_SKIP_ECW setting to disable ECW support in mapserver

qgis · Aug 12, 2013 · 4539469 · 4539469
1 parent 46355fe
commit 4539469
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,6 +43,9 @@ SET (WITH_DESKTOP TRUE CACHE BOOL "Determines whether QGIS desktop should be bui
 
 # mapserver by us disabled default because it needs FastCGI (which is optional dependency)
 SET (WITH_MAPSERVER FALSE CACHE BOOL "Determines whether QGIS mapserver should be built")
+IF(WITH_MAPSERVER)
+  SET (MAPSERVER_SKIP_ECW FALSE CACHE BOOL "Determines whether QGIS mapserver should disable ECW (ECW in server apps requires a special license)")
+ENDIF(WITH_MAPSERVER)
 
 # build our version of astyle
 SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should reindent with scripts/prepare-commit.sh (using 'our' astyle)")

diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -35,5 +35,7 @@
 
 #cmakedefine HAVE_PYTHON
 
+#cmakedefine MAPSERVER_SKIP_ECW
+
 #endif
 
diff --git a/debian/rules b/debian/rules
@@ -40,6 +40,7 @@ CMAKE_OPTS := \
 	-D PEDANTIC=TRUE \
 	-D WITH_SPATIALITE=TRUE \
 	-D WITH_MAPSERVER=TRUE \
+	-D MAPSERVER_SKIP_ECW=TRUE \
 	-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
 	-D WITH_APIDOC=TRUE
 

diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -92,6 +92,7 @@ cmake -G "Visual Studio 9 2008" ^
 	-D PEDANTIC=TRUE ^
 	-D WITH_SPATIALITE=TRUE ^
 	-D WITH_MAPSERVER=TRUE ^
+	-D MAPSERVER_SKIP_ECW=TRUE ^
 	-D WITH_ASTYLE=TRUE ^
 	-D WITH_GLOBE=TRUE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -92,6 +92,7 @@ cmake -G "Visual Studio 9 2008" ^
 	-D PEDANTIC=TRUE ^
 	-D WITH_SPATIALITE=TRUE ^
 	-D WITH_MAPSERVER=TRUE ^
+	-D MAPSERVER_SKIP_ECW=TRUE ^
 	-D WITH_GLOBE=TRUE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^

diff --git a/ms-windows/osgeo4w/package64.cmd b/ms-windows/osgeo4w/package64.cmd
@@ -102,6 +102,7 @@ set GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS_VERSION%
 cmake -G "Visual Studio 10 Win64" ^
 	-D PEDANTIC=TRUE ^
 	-D WITH_MAPSERVER=TRUE ^
+	-D MAPSERVER_SKIP_ECW=TRUE ^
 	-D WITH_GLOBE=FALSE ^
 	-D WITH_TOUCH=TRUE ^
 	-D WITH_GRASS=TRUE ^

diff --git a/src/mapserver/qgis_map_serv.cpp b/src/mapserver/qgis_map_serv.cpp
@@ -165,6 +165,12 @@ int main( int argc, char * argv[] )
   }
 #endif
 
+#if defined(MAPSERVER_SKIP_ECW)
+  QgsDebugMsg( "Skipping GDAL ECW drivers in server." );
+  QgsApplication::skipGdalDriver( "ECW" );
+  QgsApplication::skipGdalDriver( "JP2ECW" );
+#endif
+
   // Instantiate the plugin directory so that providers are loaded
   QgsProviderRegistry::instance( QgsApplication::pluginPath() );
   QgsDebugMsg( "Prefix  PATH: " + QgsApplication::prefixPath() );