From 17c1f9dc1428817aaf7dfaa57874ebf45bc2b1f5 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 20 Jan 2017 17:58:40 -0500 Subject: [PATCH] [SCons] Make definition of CANTERA_DATA local to application.cpp --- src/SConscript | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/SConscript b/src/SConscript index 4b33f55d8..1c13c0870 100644 --- a/src/SConscript +++ b/src/SConscript @@ -6,13 +6,20 @@ def defaultSetup(env, subdir, extensions): env.Append(CCFLAGS=env['pch_flags']) return mglob(env, subdir, *extensions) -def baseSetup(env, subdir, extensions): +def applicationSetup(env, subdir, extensions): + # Add #define variables unique to application.cpp escaped_datadir = '\\"' + env['ct_datadir'].replace('\\', '\\\\') + '\\"' env.Append(CPPDEFINES={'CANTERA_DATA': escaped_datadir}) return defaultSetup(env, subdir, extensions) +def baseSetup(env, subdir, extensions): + # All files in base except for application.cpp + return [f for f in defaultSetup(env, subdir, extensions) + if f.name != 'application.cpp'] + # (subdir, (file extensions), (extra setup(env))) libs = [('base', ['cpp'], baseSetup), + ('base', ['^application.cpp'], applicationSetup), ('thermo', ['cpp'], defaultSetup), ('tpx', ['cpp'], defaultSetup), ('equil', ['cpp','c'], defaultSetup),