Commit Graph

37 Commits

Author SHA1 Message Date
Ray Speth
1ff7bc2f3b [SCons] Remove check for <tr1/tuple>
Updated gtest version makes this special case unnecessary.
2014-01-21 17:22:09 +00:00
Ray Speth
a8d8f3f0ca [SCons] Check for <tr1/tuple>
This header is used by GTest. If not present, define 'GTEST_USE_OWN_TR1_TUPLE'
to use an alternative version. Fixes a compilation error on OS X.
2014-01-08 17:10:34 +00:00
Ray Speth
e1074722c5 [SCons] Restore 'single_library' build option
The 'single_library=y' build option must be retained in order to support
compilation on Windows and OS X.
2013-10-04 16:22:55 +00:00
Harry Moffat
cfa4493b51 Worked on fixing errors in the code that caused problems with downstream code.
Took out single_species compilation option

took out some deprecated warnings

Fixed an error in copy constructors for thermo.

Still an error with PYTHONPATH and the test suite

 -- more to come.
2013-09-02 00:58:28 +00:00
Ray Speth
1856a060c9 [SCons] Made installation of gtest optional
The default is to not install it, since most users do not need it.
2013-02-15 17:32:31 +00:00
Harry Moffat
287de5e1fb Added gtest to Cantera's application environment. 2013-02-05 00:32:05 +00:00
Ray Speth
978e3605bd [SCons] Cleanup of the build scripts 2013-02-01 23:39:53 +00:00
Harry Moffat
c6f7abbf2f Fixed a serious error in InterfaceKinetics that had crept into this branch.
Started upgrade/update of equilibrium solver
       - Fixed numerical jacobian calculation of the ln activity coefficients.
2012-11-29 02:18:05 +00:00
Harry Moffat
08a41f191c Added back constructPhaseFile() and constructPhaseXML().
All molten salt problems were broken and some brine problems were broken.
2012-11-07 23:51:30 +00:00
Ray Speth
c092bbaede Fixed the order of include and library directories when compiling
Include directories in the Cantera source tree should be listed first so that
they take precedence over headers from other installed copies of Cantera that
might end up on the include search path. This was potentially a problem when
Cantera was installed in the same location (e.g. /usr/local) as one of its
dependencies (e.g. Sundials).

The same logic applies to directories on the library link path.
2012-08-10 21:03:06 +00:00
Ray Speth
e11281477e Added configuration option for building a single library
This is necessary particularly for Windows, where there's no easy way
to build shared libraries of the f2c code because those functions
don't have the necessary __declspec(dllexport) in their non-existent
headers.
2012-04-05 22:03:30 +00:00
Harry Moffat
25ba149aab Sorry for monolithic commit. Will break it up in the future.
Moved the external libraries to separate library files so that libcantera.a just contains its own namespace externals.

Fixed several errors in the equilibrium program that occurred during the port. (int to size_t issues).

Moved some equilibrium program headers to the include file system, so that it can link with equilibrium program.

Worked on Cantera.mak. Needs more work.

Fixed an issue with the Residual virtual base classes within numerics. They didn't inherit due to int to size_t migration. This caused numerous test problems to fail (issue with backwards compatibility - do we want it and how much do we want?).

Added csvdiff back so that it's available for shell environment runtests.
2012-04-05 00:24:31 +00:00
Ray Speth
d16f70ab44 Fixed some spelling issues 2012-04-04 18:44:24 +00:00
Ray Speth
4506ee2f8a Fixed some compiler warning issues 2012-03-15 19:55:18 +00:00
Ray Speth
6ec589a9e5 Fixed compiler warnings in libexecstream 2012-03-15 19:55:07 +00:00
Ray Speth
82d467944f Eliminated temporary files from the ct2ctml conversion process
Added libstringstream, which maps stdin and stdout to std::iostream.
Using this library means we no longer create either the temporary .py
file or the ct2ctml.log file.

This also eliminates the synchronization problems that motivated the
sleep commands around the system call, so cti to ctml conversions are
significantly faster now.
2012-03-09 22:59:21 +00:00
Ray Speth
8150f49c2c Simplified adding SCons build and install targets 2012-03-05 20:45:20 +00:00
Ray Speth
77cd424821 Added support for compiling with Clang 2012-02-28 23:48:53 +00:00
Ray Speth
8877f95e3c Modified some compiler warning settings 2012-02-28 19:01:35 +00:00
Ray Speth
a0802e3ad0 Fixed some problems building with Fortran sources for BLAS, LAPACK, etc. 2012-02-23 21:24:32 +00:00
Ray Speth
99d951ceb8 Cantera now produces a single library for linking C++ applications 2012-02-13 17:24:34 +00:00
Ray Speth
eb2cab5f2b Updates to SCons scripts to support the new directory structure 2012-02-12 02:46:40 +00:00
Ray Speth
38f6ebd76b Added unit tests for the NasaPoly1 class 2012-02-01 23:35:01 +00:00
Ray Speth
1a84d21efb Imported source code for googletest 2012-02-01 23:34:40 +00:00
Ray Speth
310dec47f0 Supress warnings in externally-supplied code (f2c, cvode) 2012-01-17 23:58:33 +00:00
Ray Speth
8e1cdc4ce4 Fixed attempt to link against libm with MSVC 2011-12-15 00:04:08 +00:00
Ray Speth
2cf75e969e Fixed linking order for libm when building arithchk 2011-12-14 19:41:28 +00:00
Ray Speth
4b114f020e Add stage_dir config option
This option stages "installed" files in a local directory which can
then be used to generate installation packages while $prefix still
references the final installed location.
2011-12-14 19:41:21 +00:00
Ray Speth
2f7fdd5066 Fix for building system-dependent headers in f2c_libs
SCons couldn't resolve dependencies on files created by CopyNoPrefix,
so now the paths to these headers are specified relative to the
project root.
2011-12-14 19:36:36 +00:00
Ray Speth
ef617af524 Fixed compilation issues when compiling without Sundials
ctnumerics and the included CVODE had been broken
2011-12-14 19:34:10 +00:00
Ray Speth
60a00546dc Added include directory for f2c code
Most f2c code needs the "f2c.h" file, which is only in the
ext/f2c_libs directory, but this error doesn't usually show up
because it is also in /usr/include on most Unix systems.
2011-12-14 19:34:04 +00:00
Ray Speth
098501cbe4 Fixed several platform-dependent preprocessor defines to work with Windows 2011-12-14 19:33:53 +00:00
Ray Speth
2d8b1f4431 SCons install target now copies header files to the installation directory 2011-12-14 03:52:26 +00:00
Ray Speth
702ae7251d Added SCons installation targets for libraries and binaries 2011-12-14 03:52:19 +00:00
Ray Speth
53cfa84670 SCons now builds the Python module 2011-12-14 03:04:18 +00:00
Ray Speth
b6bfca8e94 SCons now builds the Cantera kernel 2011-12-14 03:03:57 +00:00
Ray Speth
2c4623e336 SCons can now build the contents of the 'ext' directory 2011-12-14 02:41:29 +00:00