Merge bug fixes from the 2.0 maintenance branch

This commit is contained in:
Ray Speth
2012-08-15 15:36:34 +00:00
12 changed files with 39 additions and 26 deletions
+3 -3
View File
@@ -4,9 +4,9 @@ import subprocess
Import('env','build','install')
localenv = env.Clone()
localenv.Append(CPPPATH=['#ext/gtest/include', '#include'],
LIBPATH='#build/lib',
LIBS=['gtest'] + localenv['cantera_libs'])
localenv.Prepend(CPPPATH=['#ext/gtest/include', '#include'],
LIBPATH='#build/lib')
localenv.Append(LIBS=['gtest'] + localenv['cantera_libs'])
localenv['ENV']['PYTHONPATH'] = Dir('#interfaces/python').abspath
localenv['ENV']['CANTERA_DATA'] = Dir('#build/data').abspath