From 736fccf7ef863e37e268334fa4308652be972058 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 5 Jun 2013 03:08:48 +0000 Subject: [PATCH] SCons-generated SConstruct files specify Visual Studio version --- samples/cxx/SConscript | 6 ++++++ samples/cxx/SConstruct.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/samples/cxx/SConscript b/samples/cxx/SConscript index 8761a15b7..06e00a8a9 100644 --- a/samples/cxx/SConscript +++ b/samples/cxx/SConscript @@ -49,6 +49,12 @@ for subdir, name, extensions in samples: localenv['tmpl_cantera_linkflags'] = repr([x for x in linkflags if x]) localenv['tmpl_progname'] = name localenv['tmpl_sourcename'] = name + '.cpp' + env_args = [] + if localenv['TARGET_ARCH'] is not None: + env_args.append('TARGET_ARCH={0!r}'.format(localenv['TARGET_ARCH'])) + if 'MSVC_VERSION' in localenv: + env_args.append('MSVC_VERSION={0!r}'.format(localenv['MSVC_VERSION'])) + localenv['tmpl_env_args'] = ', '.join(env_args) sconstruct = localenv.SubstFile(pjoin(subdir, 'SConstruct'), 'SConstruct.in') install(pjoin('$inst_sampledir', 'cxx', subdir), sconstruct) diff --git a/samples/cxx/SConstruct.in b/samples/cxx/SConstruct.in index c5b7b65e9..cae5ff129 100644 --- a/samples/cxx/SConstruct.in +++ b/samples/cxx/SConstruct.in @@ -1,4 +1,4 @@ -env = Environment() +env = Environment(@tmpl_env_args@) env.Append(CCFLAGS=@tmpl_compiler_flags@, CPPPATH=@tmpl_cantera_incdirs@,