From 9966a24a3f2e547eb0f7ab4eea48dc4af3f091d3 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 13 Aug 2012 20:13:56 +0000 Subject: [PATCH] Fixed library specifications in installed SConstruct scripts for samples cherry-pick of r1632 from 2.0 maintenance branch --- samples/cxx/SConscript | 4 +--- samples/f77/SConscript | 5 ++--- samples/f90/SConscript | 5 ++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/samples/cxx/SConscript b/samples/cxx/SConscript index 401b4289a..0ed0f2f0d 100644 --- a/samples/cxx/SConscript +++ b/samples/cxx/SConscript @@ -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 diff --git a/samples/f77/SConscript b/samples/f77/SConscript index 638ebc9f4..cc5b2dd78 100644 --- a/samples/f77/SConscript +++ b/samples/f77/SConscript @@ -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') diff --git a/samples/f90/SConscript b/samples/f90/SConscript index 790cee916..7461f5674 100644 --- a/samples/f90/SConscript +++ b/samples/f90/SConscript @@ -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