Skip to content
Snippets Groups Projects

Support new Gaudi CMake

Merged Marco Clemencic requested to merge support-new-gaudi-cmake into master
1 file
+ 10
0
Compare changes
  • Side-by-side
  • Inline
@@ -374,12 +374,22 @@ class cmake_new(object):
' CACHE STRING "override")\n').format(action)
for action in ('COMPILE', 'LINK', 'CUSTOM'))
def _env(self, project, env=None):
'''
Compute the environment for the project.
'''
new_env = project.environment()
if env:
new_env.update(env)
return new_env
def _call(self, proj, cmd, **kwargs):
# strip special kwargs before command invocation
cmd_kwargs = {
n: v
for n, v in kwargs.items() if n not in self.SPECIAL_ARGS
}
cmd_kwargs['env'] = self._env(proj, kwargs.get('env'))
__log__.debug('running %s', ' '.join(cmd))
started = datetime.now()
Loading