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:05:19 +0200 |
| commit | 3f1412ff7bbfd7b1a15b7ed8c574ee8ba5aa6309 (patch) | |
| tree | 78efca639cc8997b635cb3d1037c57a1f70b9d84 /django/contrib/gis/gdal | |
| parent | e24e9e0438cf3ba6c557558f68587d135a85e126 (diff) | |
| download | django-3f1412ff7bbfd7b1a15b7ed8c574ee8ba5aa6309.tar.gz | |
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.
Diffstat (limited to 'django/contrib/gis/gdal')
| -rw-r--r-- | django/contrib/gis/gdal/libgdal.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index 40f302f1be..7bcf93f518 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'] 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'] else: raise OGRException('Unsupported OS "%s"' % os.name) |