diff options
| author | Claude Paroz <claude@2xlibre.net> | 2014-07-21 19:02:25 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2014-07-21 19:07:48 +0200 |
| commit | 6e41ae1a4e924908fc07ef6b4ce28feb31c994fd (patch) | |
| tree | e27308d5c7184f59937677c92e79ccdcf9b659c8 | |
| parent | e2220c1c086675e5c3a87d2f09cb71e6562ad733 (diff) | |
[1.7.x] Fixed #23064 -- Added lib detection support for GDAL 1.10/1.11
Note that GDAL 1.11 is not yet officially supported, until someone
has tested it and can confirm it has no issues with Django.
Backport of 3f1412ff7b from master.
| -rw-r--r-- | django/contrib/gis/gdal/libgdal.py | 6 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/install/geolibs.txt | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index 40f302f1be..3c9e1828d5 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -23,11 +23,11 @@ if lib_path: lib_names = None elif os.name == 'nt': # Windows NT shared libraries - lib_names = ['gdal19', 'gdal18', 'gdal17', 'gdal16', 'gdal15'] + lib_names = ['gdal111', 'gdal110', 'gdal19', 'gdal18', 'gdal17', 'gdal16'] elif os.name == 'posix': # *NIX library names. - lib_names = ['gdal', 'GDAL', 'gdal1.9.0', 'gdal1.8.0', 'gdal1.7.0', - 'gdal1.6.0', 'gdal1.5.0'] + lib_names = ['gdal', 'GDAL', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0', + 'gdal1.8.0', 'gdal1.7.0', 'gdal1.6.0'] else: raise OGRException('Unsupported OS "%s"' % os.name) diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index 6abc296bff..981a19aebd 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -28,6 +28,7 @@ Program Description Required GDAL 1.8.0 2011-01-13 GDAL 1.9.0 2012-01-03 GDAL 1.10.0 2013-04-29 + GDAL 1.11.0 2014-04-25 # To be tested! PostGIS 1.3.0 2007-08-09 PostGIS 1.4.0 2009-07-24 PostGIS 1.5.0 2010-02-04 |