From f4a132256a2eadf5586e2b758ff64de602c21d6e Mon Sep 17 00:00:00 2001 From: Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:42:18 +0200 Subject: qgis: fix build of LTS release with proj>7 (#26696) Co-authored-by: Sinan Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/qgis/package.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/qgis/package.py b/var/spack/repos/builtin/packages/qgis/package.py index ab7f60c91c..a0ef76b92b 100644 --- a/var/spack/repos/builtin/packages/qgis/package.py +++ b/var/spack/repos/builtin/packages/qgis/package.py @@ -161,7 +161,10 @@ class Qgis(CMakePackage): self.spec['geos'].prefix.bin, '-DGSL_CONFIG_PREFER_PATH=' + self.spec['gsl'].prefix.bin, '-DPOSTGRES_CONFIG_PREFER_PATH=' + - self.spec['postgresql'].prefix.bin + self.spec['postgresql'].prefix.bin, + '-DPROJ_INCLUDE_DIR=' + self.spec['proj'].headers.directories[0], + '-DSQLITE3_LIBRARY=' + + self.spec['sqlite'].libs[0] ]) args.extend([ @@ -232,3 +235,7 @@ class Qgis(CMakePackage): else: args.append('-DWITH_GRASS7=OFF') return args + + def check(self): + """The tests of fail without access to an X server, cant run on build servers""" + pass -- cgit v1.2.3-70-g09d2