diff --git a/Cantera/python/SConscript b/Cantera/python/SConscript index 7ae2a14fe..f9b49b7ac 100644 --- a/Cantera/python/SConscript +++ b/Cantera/python/SConscript @@ -7,10 +7,13 @@ localenv = env.Clone() gcv = distutils.sysconfig.get_config_var -localenv.Append(CPPPATH=[gcv('INCLUDEPY')], +localenv.Append(CPPPATH=[gcv('INCLUDEPY'), env['python_array_include']], SHLINKFLAGS=gcv('LDFLAGS'), CPPFLAGS=[gcv('BASECFLAGS'), gcv('OPT')]) +if localenv['OS'] == 'Windows': + localenv.Append(LIBPATH=pjoin(gcv('prefix'), 'libs')) + make_setup = localenv.SubstFile('setup.py', 'setup.py.in') if env['python_package'] == 'full': diff --git a/SConstruct b/SConstruct index 4949c710b..0c1668a6c 100644 --- a/SConstruct +++ b/SConstruct @@ -467,7 +467,13 @@ if env['python_package'] in ('full','default'): if env['python_array_home']: sys.path.append(env['python_array_home']) try: - __import__(env['python_array']) + np = __import__(env['python_array']) + try: + env['python_array_include'] = np.get_include() + except AttributeError: + print """WARNING: Couldn't find include directory for Python array package""" + env['python_array_include'] = '' + print """INFO: Building the full Python package using %s.""" % env['python_array'] env['python_package'] = 'full' except ImportError: