research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCons] Fix some dependency issues for building "ctpath.m"

Browse source
This commit is contained in:
Ray Speth 2013-09-06 20:34:18 +00:00
parent 7683677cac
commit 721f0266be
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -937,6 +937,8 @@ if env['python_package'] in ('full','default','new'):
else:
warnNoPython = False
env['python_array_include'] = ''
env['python_module_loc'] = ''
env['install_python2_action'] = ''
# Python 3 Package Settings

4
src/matlab/SConscript
View file

@ -78,15 +78,17 @@ env['matlab_extension'] = ctmethods
### Install the Matlab toolbox ###
# 'ctpath.m'
globalenv = env
def copy_var(target, source, env):
if env['python_prefix'] == 'USER':
env['python_module_loc_sc'] = ''
else:
env['python_module_loc_sc'] = env['python_module_loc']
env['python_module_loc_sc'] = globalenv['python_module_loc']
target = localenv.SubstFile('#interfaces/matlab/ctpath.m',
'#interfaces/matlab/ctpath.m.in')
localenv.AddPreAction(target, copy_var)
localenv.Depends(target, env['install_python2_action'])
install('$inst_matlab_dir', target)
# 'cantera_demos.m'