SCons now installs the fortran .mod files in the include directory

This commit is contained in:
Ray Speth 2011-12-14 03:52:31 +00:00
parent 2d8b1f4431
commit d742f7d9e6
2 changed files with 18 additions and 5 deletions

View file

@ -4,12 +4,24 @@ Import('env', 'buildTargets', 'installTargets')
localenv = env.Clone()
f90_src = mglob(localenv, 'src', 'f90', 'cpp')
artifacts = localenv.Object(f90_src)
mods = [o for o in artifacts if o.path.endswith('.mod')]
objs = [o for o in artifacts if not o.path.endswith('.mod')]
lib = localenv.Library(target=pjoin('..','..','lib','fct'),
source=mglob(localenv, 'src', 'f90', 'cpp'))
source=objs)
buildTargets.extend(lib)
inst = localenv.Install('$ct_libdir', lib)
installTargets.extend(inst)
installTargets.extend(localenv.Install('$ct_incdir', mods))
# Copy the mod files to the include directory
for mod in mglob(localenv, 'src', 'mod'):
copy = localenv.Command('../../include/cantera/%s' % mod.name, mod,
Copy('$TARGET', '$SOURCE'))
for mod in mods:
copy = localenv.Command(target=pjoin('..','..','include','cantera', mod.name),
source=mod,
action=Copy('$TARGET', '$SOURCE'))
localenv.AddPostAction(lib, copy)
buildTargets.extend(copy)

View file

@ -109,7 +109,8 @@ if env['matlab_toolbox'] != 'n':
# Options that apply only if building the Fortran interface
if env['f90_interface']:
opts.AddVariables(
PathVariable('f90', 'Fortran compiler', 'gfortran'),
PathVariable('f90', 'Fortran compiler',
'gfortran', PathVariable.PathAccept),
('f90flags', '', '-O3')
)