zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GDAL: CMake support and dependency variants (#31197)

Browse Source 
Add support for CMake builds while preserving autotools support
for older versions of GDAL

* Add GDAL 3.5.0
* Remove GDAL 1
* Add support for new CMake build system
* Change defaults to build all recommended dependencies
* Simplify Autotools flag handling
* Determine version range for drivers
This commit is contained in:
Adam J. Stewart 2022-07-13 11:58:39 -07:00 committed by GitHub
parent f7ed9092e5
commit 752697add2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 530 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

976
var/spack/repos/builtin/packages/gdal/package.py
View File

File diff suppressed because it is too large Load Diff

5
var/spack/repos/builtin/packages/gplates/package.py
View File

@ -21,8 +21,7 @@ class Gplates(CMakePackage):
manual_download = True manual_download = True
version('2.3.0', sha256='7d4be9d524d1fcbb6a81de29bd1d4b13133082db23f0808965c5efe30e9538ab') version('2.3.0', sha256='7d4be9d524d1fcbb6a81de29bd1d4b13133082db23f0808965c5efe30e9538ab')
version('2.1.0', sha256='5a52242520d7e243c541e164c8417b23f4e17fcd79ed81f865b2c13628bb0e07', deprecated=True) version('2.1.0', sha256='5a52242520d7e243c541e164c8417b23f4e17fcd79ed81f865b2c13628bb0e07')
version('2.0.0', sha256='1c27d3932a851153baee7cec48e57c2bbc87e4eea02f8a986882515ba4b44c0b', deprecated=True)
depends_on('cmake@3.5:', when='@2.3:', type='build') depends_on('cmake@3.5:', when='@2.3:', type='build')
depends_on('cmake@2.8.8:', when='@2.1', type='build') depends_on('cmake@2.8.8:', when='@2.1', type='build')
@ -43,8 +42,6 @@ class Gplates(CMakePackage):
depends_on('qt@4.4:4+opengl', when='@:2.1') depends_on('qt@4.4:4+opengl', when='@:2.1')
depends_on('gdal@1.3.2:', when='@2.3:') depends_on('gdal@1.3.2:', when='@2.3:')
depends_on('gdal@1.3.2:2', when='@2.1') depends_on('gdal@1.3.2:2', when='@2.1')
# GDAL's OGRSFDriverRegistrar is not compatible anymore starting with 2.0.
depends_on('gdal@1.3.2:1', when='@2.0')
depends_on('cgal@4.7:', when='@2.3:') depends_on('cgal@4.7:', when='@2.3:')
depends_on('cgal@3.3.1:', when='@:2.1') depends_on('cgal@3.3.1:', when='@:2.1')
depends_on('proj@4.6:', when='@2.3:') depends_on('proj@4.6:', when='@2.3:')

2
var/spack/repos/builtin/packages/ncl/package.py
View File

@ -90,7 +90,7 @@ class Ncl(Package):
# Some of the optional dependencies according to the manual: # Some of the optional dependencies according to the manual:
depends_on('hdf', when='+hdf4') depends_on('hdf', when='+hdf4')
depends_on('gdal+proj@:2.4', when='+gdal') depends_on('gdal@:2.4', when='+gdal')
depends_on('udunits', when='+udunits2') depends_on('udunits', when='+udunits2')
# We need src files of triangle to appear in ncl's src tree if we want # We need src files of triangle to appear in ncl's src tree if we want