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

[SCons] Fix linking boost_thread in more places

Browse source
This commit is contained in:
Ray Speth 2013-09-30 16:02:39 +00:00
parent c028f4cc5c
commit 584392d856
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SConstruct
View file

@ -1327,7 +1327,6 @@ if addInstallActions:
linkLibs = ['cantera']
linkSharedLibs = ['cantera_shared']
if env['use_sundials'] == 'y':
env['sundials_libs'] = ['sundials_cvodes', 'sundials_ida', 'sundials_nvecserial']
linkLibs.extend(('sundials_cvodes', 'sundials_ida', 'sundials_nvecserial'))
@ -1363,6 +1362,9 @@ elif not env['single_library']:
linkLibs.append('ctf2c')
linkSharedLibs.append('ctf2c_shared')
linkLibs.extend(env['boost_libs'])
linkSharedLibs.extend(env['boost_libs'])
# Store the list of needed static link libraries in the environment
env['cantera_libs'] = linkLibs
env['cantera_shared_libs'] = linkSharedLibs

2
src/apps/SConscript
View file

@ -7,7 +7,7 @@ localenv.Prepend(CPPPATH=['#src', '#include', '#src/apps'])
def buildProgram(name, src):
prog = build(localenv.Program(target=pjoin('#build/bin', name),
source=src,
LIBS=env['cantera_libs']+env['boost_libs']))
LIBS=env['cantera_libs']))
install('$inst_bindir', prog)
buildProgram('cti2ctml', ['cti2ctml.cpp'])