Skip to content

handle templating correctly in CMakeMake when playing with configopts #2882

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
merged 4 commits into from
Mar 15, 2023
Merged

handle templating correctly in CMakeMake when playing with configopts #2882

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0194c09
handle templating correctly when playing with configopts
mboisson Feb 8, 2023
950582f
appeasing hound
mboisson Feb 8, 2023
1714017
use with self.cfg.disable_templating():
mboisson Feb 9, 2023
7622313
removed forgotten enable_templating = False line
mboisson Feb 9, 2023
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
6 changes: 5 additions & 1 deletion easybuild/easyblocks/generic/cmakemake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,11 @@ def build_type(self):

def prepend_config_opts(self, config_opts):
"""Prepends configure options (-Dkey=value) to configopts ignoring those already set"""
cfg_configopts = self.cfg['configopts']
# need to disable template resolution or it will remain the same for all runs
self.cfg.enable_templating = False
with self.cfg.disable_templating():
cfg_configopts = self.cfg['configopts']

# All options are of the form '-D<key>=<value>'
new_opts = ' '.join('-D%s=%s' % (key, value) for key, value in config_opts.items()
if '-D%s=' % key not in cfg_configopts)
Expand Down