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

[SCons] Fix handling of blas_lapack_dir and boost_lib_dir

Browse source 
These need to be added to LIBPATH as entries in a list, otherwise
LIBPATH ends up concatenating the strings for each as a single entry.
This commit is contained in:
Ray Speth 2013-06-14 23:06:29 +00:00
parent 7b7e578500
commit 97ff4fa2a5
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SConstruct
View file

@ -710,10 +710,10 @@ if env['boost_inc_dir']:
env.Append(CPPPATH=env['boost_inc_dir'])
if env['boost_lib_dir']:
env.Append(LIBPATH=env['boost_lib_dir'])
env.Append(LIBPATH=[env['boost_lib_dir']])
if env['blas_lapack_dir']:
env.Append(LIBPATH=env['blas_lapack_dir'])
env.Append(LIBPATH=[env['blas_lapack_dir']])
if (env['use_sundials'] == 'default' and
(env['sundials_include'] or env['sundials_libdir'])):

3
src/SConscript
View file

@ -61,6 +61,9 @@ if localenv['OS'] in ('Darwin', 'Windows'):
if (localenv['use_sundials'] == 'y'):
localenv.Append(LIBS=localenv['sundials_libs'],
LIBPATH=localenv['sundials_libdir'])
if localenv['blas_lapack_libs']:
localenv.Append(LIBS=localenv['blas_lapack_libs'],
LIBPATH=localenv['blas_lapack_dir'])
if localenv['toolchain'] == 'mingw':
localenv.Append(LINKFLAGS=['-static-libgcc', '-static-libstdc++'])