Skip to content

add option in Qt easyblock to check for QtWebEngine component in sanity check #1544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
damianam merged 1 commit into from
Oct 12, 2018
Merged

add option in Qt easyblock to check for QtWebEngine component in sanity check #1544

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions easybuild/easyblocks/q/qt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
from easybuild.tools.run import run_cmd_qa
from easybuild.tools.systemtools import get_shared_lib_ext


class EB_Qt(ConfigureMake):
"""
Support for building and installing Qt.
Expand All @@ -46,7 +47,8 @@ class EB_Qt(ConfigureMake):
@staticmethod
def extra_options():
extra_vars = {
'platform': [None, "Target platform to build for (e.g. linux-g++-64, linux-icc-64)", CUSTOM],
'check_qtwebengine': [False, "Make sure QtWebEngine components is installed", CUSTOM],
'platform': [None, "Target platform to build for (e.g. linux-g++-64, linux-icc-64)", CUSTOM],
}
extra_vars = ConfigureMake.extra_options(extra_vars)

Expand All @@ -65,17 +67,17 @@ def configure_step(self):
if self.cfg['platform']:
platform = self.cfg['platform']
# if no platform is specified, try to derive it based on compiler in toolchain
elif comp_fam in [toolchain.GCC]: #@UndefinedVariable
elif comp_fam in [toolchain.GCC]: # @UndefinedVariable
platform = 'linux-g++-64'
elif comp_fam in [toolchain.INTELCOMP]: #@UndefinedVariable
elif comp_fam in [toolchain.INTELCOMP]: # @UndefinedVariable
if LooseVersion(self.version) >= LooseVersion('4'):
platform = 'linux-icc-64'
else:
platform = 'linux-icc'
# fix -fPIC flag (-KPIC is not correct for recent Intel compilers)
qmake_conf = os.path.join('mkspecs', platform, 'qmake.conf')
apply_regex_substitutions(qmake_conf, [('-KPIC', '-fPIC')])

if platform:
self.cfg.update('configopts', "-platform %s" % platform)
else:
Expand Down Expand Up @@ -138,6 +140,10 @@ def sanity_check_step(self):
'dirs': ['include', 'plugins'],
}

if self.cfg['check_qtwebengine']:
qtwebengine_libs = ['libQt%s%s.%s' % (libversion, l, shlib_ext) for l in ['WebEngine', 'WebEngineCore']]
custom_paths['files'].extend([os.path.join('lib', lib) for lib in qtwebengine_libs])

if LooseVersion(self.version) >= LooseVersion('4'):
custom_paths['files'].append('bin/xmlpatterns')

Expand Down