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

Fixed library specifications in installed SConstruct scripts for samples

Browse source 
cherry-pick of r1632 from 2.0 maintenance branch
This commit is contained in:
Ray Speth 2012-08-13 20:13:56 +00:00
parent 443e35bc36
commit 9966a24a3f
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
samples/cxx/SConscript
View file

@ -28,13 +28,11 @@ for subdir, name, extensions in samples:
## Generate SConstruct files to be installed
incdirs = (localenv['ct_incroot'], localenv['sundials_include'],
localenv['boost_inc_dir'])
libs = (['cantera'] + localenv['sundials_libs'] +
localenv['boost_libs'] + localenv['blas_lapack_libs'])
libdirs = (localenv['ct_libdir'], localenv['sundials_libdir'],
localenv['blas_lapack_dir'], localenv['boost_lib_dir'])
linkflags = ('-g', localenv['thread_flags'])
localenv['tmpl_cantera_incdirs'] = repr([x for x in incdirs if x])
localenv['tmpl_cantera_libs'] = repr([x for x in libs if x])
localenv['tmpl_cantera_libs'] = repr(localenv['cantera_libs'])
localenv['tmpl_cantera_libdirs'] = repr([x for x in libdirs if x])
localenv['tmpl_cantera_linkflags'] = repr([x for x in linkflags if x])
localenv['tmpl_progname'] = name

5
samples/f77/SConscript
View file

@ -20,13 +20,12 @@ for program_name, fortran_sources in samples:
# Generate SConstruct file to be installed
incdirs = (localenv['ct_incroot'], localenv['sundials_include'],
localenv['boost_inc_dir'])
libs = (['cantera_fortran', 'cantera'] + localenv['sundials_libs'] +
localenv['boost_libs'] + localenv['blas_lapack_libs'] + ['stdc++'])
libs = ['cantera_fortran'] + localenv['cantera_libs'] + ['stdc++']
libdirs = (localenv['ct_libdir'], localenv['sundials_libdir'],
localenv['blas_lapack_dir'], localenv['boost_lib_dir'])
linkflags = ('-g', localenv['thread_flags'])
localenv['tmpl_cantera_incdirs'] = repr([x for x in incdirs if x])
localenv['tmpl_cantera_libs'] = repr([x for x in libs if x])
localenv['tmpl_cantera_libs'] = repr(libs)
localenv['tmpl_cantera_libdirs'] = repr([x for x in libdirs if x])
localenv['tmpl_cantera_linkflags'] = repr([x for x in linkflags if x])
sconstruct = localenv.SubstFile('SConstruct', 'SConstruct.in')

5
samples/f90/SConscript
View file

@ -14,13 +14,12 @@ for programName, sources in samples:
# Generate SConstruct files to be installed
incdirs = [pjoin(localenv['ct_incroot'], 'cantera')]
libs = (['cantera_fortran', 'cantera'] + localenv['sundials_libs'] +
localenv['boost_libs'] + localenv['blas_lapack_libs'] + ['stdc++'])
libs = ['cantera_fortran'] + localenv['cantera_libs'] + ['stdc++']
libdirs = (localenv['ct_libdir'], localenv['sundials_libdir'],
localenv['blas_lapack_dir'], localenv['boost_lib_dir'])
linkflags = ('-g', localenv['thread_flags'])
localenv['tmpl_cantera_incdirs'] = repr([x for x in incdirs if x])
localenv['tmpl_cantera_libs'] = repr([x for x in libs if x])
localenv['tmpl_cantera_libs'] = repr(libs)
localenv['tmpl_cantera_libdirs'] = repr([x for x in libdirs if x])
localenv['tmpl_cantera_linkflags'] = repr([x for x in linkflags if x])
localenv['tmpl_progname'] = programName