diff options
| author | David Smith <smithdc@gmail.com> | 2020-06-04 20:40:26 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-06-08 09:50:24 +0200 |
| commit | 1ac45e619daf63ba2f3df219c9d63302e53475be (patch) | |
| tree | 97c165a19ccfdefad3c77a89475294b4c1ddf2ee | |
| parent | 83749dca7a292e966352278e2fd45bce09c1994f (diff) | |
[3.1.x] Fixed #31662 -- Added detection for GDAL 3.0 and 3.1 on Windows.
Backport of 4652f1f0aa459a7b980441d629648707c32e36bf from master
| -rw-r--r-- | django/contrib/gis/gdal/libgdal.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index ed00da159f..79408d4858 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -20,10 +20,14 @@ if lib_path: lib_names = None elif os.name == 'nt': # Windows NT shared libraries - lib_names = ['gdal204', 'gdal203', 'gdal202', 'gdal201', 'gdal20'] + lib_names = ['gdal301', 'gdal300', 'gdal204', 'gdal203', 'gdal202', 'gdal201', 'gdal20'] elif os.name == 'posix': # *NIX library names. - lib_names = ['gdal', 'GDAL', 'gdal2.4.0', 'gdal2.3.0', 'gdal2.2.0', 'gdal2.1.0', 'gdal2.0.0'] + lib_names = [ + 'gdal', 'GDAL', + 'gdal3.1.0', 'gdal3.0.0', + 'gdal2.4.0', 'gdal2.3.0', 'gdal2.2.0', 'gdal2.1.0', 'gdal2.0.0', + ] else: raise ImproperlyConfigured('GDAL is unsupported on OS "%s".' % os.name) |