From 2bc97f62fd27a8e755f21ab91bf56c1e99fa0838 Mon Sep 17 00:00:00 2001 From: Eric Brugger Date: Thu, 14 Oct 2021 04:41:26 -0700 Subject: Qt: Qt fixes for a Cray AMD system. (#26722) * Qt fixes for a Cray AMD system. * Update to latest changes. --- var/spack/repos/builtin/packages/qt/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index ecee1f94d0..c036326c4b 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -235,7 +235,7 @@ class Qt(Package): 'apple-clang': ('clang-libc++', 'clang'), 'clang': ('clang-libc++', 'clang'), 'gcc': ('g++',)} - platform_mapping = {'darwin': 'macx'} + platform_mapping = {'darwin': ('macx'), 'cray': ('linux')} def url_for_version(self, version): # URL keeps getting more complicated with every release @@ -627,6 +627,9 @@ class Qt(Package): elif version < Version('5.15') and '+gui' in spec: # Linux-only QT5 dependencies config_args.append('-system-xcb') + if '+opengl' in spec: + config_args.append('-I{0}/include'.format(spec['libx11'].prefix)) + config_args.append('-I{0}/include'.format(spec['xproto'].prefix)) if '~webkit' in spec: config_args.extend([ -- cgit v1.2.3-70-g09d2