Commit graph

79 commits

Author SHA1 Message Date
Ray Speth
4f600c048e Fixed compilation of the C++ and Fortran sample programs 2012-02-15 18:06:55 +00:00
Ray Speth
f65da5d277 Fixed compilation of the Fortran 90 module 2012-02-15 18:06:50 +00:00
Ray Speth
b8ac7f9ccb Added SCons options for propagating environment variables 2012-02-15 01:01:40 +00:00
Ray Speth
3ca1eb819e SCons can now build and install the Doxygen-generated documentation 2012-02-13 17:24:44 +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
8239c18091 Fixed some installation issues with samples and the Python module 2012-02-13 17:24:09 +00:00
Ray Speth
fc1b2f16f0 Updated Matlab build scripts to work with new directory structure 2012-02-12 20:44:28 +00:00
Ray Speth
2589e3c926 Fixed header file installation 2012-02-12 02:47:49 +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
bd2bc32689 Fixed a bug in SConstruct with using system BLAS and LAPACK 2012-02-03 19:28:56 +00:00
Ray Speth
1618de5a24 Added explicit dependency for Matlab extension on clib headers 2012-02-03 19:28:49 +00:00
Ray Speth
33c866447d Added scons options to use a specific version of MSVC
The default is to use the same one as the copy of Python
used by SCons, which is required to build the Python module.
2012-02-02 17:18:27 +00:00
Ray Speth
ffb4093bf2 Include 'config.h' when installing header files 2012-02-02 17:18:23 +00:00
Ray Speth
38f6ebd76b Added unit tests for the NasaPoly1 class 2012-02-01 23:35:01 +00:00
Ray Speth
d5e500d3cc Install python module in the staging directory 2012-01-27 19:31:39 +00:00
Ray Speth
cd4d4f01b6 Removed some unused preprocessor definitions 2012-01-19 20:30:38 +00:00
Ray Speth
d3c09984d0 Fixed some preprocessor directives for MinGW
The purpose of these changes is to make the distinction between
compiling under Windows (in which case _WIN32 is defined) and
compiling with the Microsoft compiler (in which case _MSC_VER is
defined). These changes are from the patch submitted by David
Fronczek.
2012-01-19 20:30:26 +00:00
Ray Speth
4ab232da44 Allow optional collection of code coverage information with gcc 2012-01-18 23:44:57 +00:00
Ray Speth
85c34049b6 Added support for running single tests with SCons
Run the 'foo' test with 'scons test-foo'.
Also simplified the names for many tests.
2012-01-09 17:35:06 +00:00
Ray Speth
8b699082c8 Removed cantera/kernel from include path
The "cantera/kernel" directory is now part of the include path only
when building the Cantera kernel. All other modules include files in
this directory as "kernel/header.h".

This fixes a problem distinguishing between kernel/Kinetics.h and
kinetics.h on Windows.
2012-01-09 17:31:21 +00:00
Ray Speth
f7f1c4e434 Added Matlab toolbox to Wix installer 2012-01-09 17:31:10 +00:00
Ray Speth
b6f80caadf Fixes to get the Matlab toolbox compiling in Windows 2012-01-09 17:30:39 +00:00
Ray Speth
b27b0daf0e Removed CANTERA_DATA from config.h
The CANTERA_DATA definition is used only in misc.cpp, so defining it
only when compiling this file reduces the amount of recompilation
required when the definition of CANTERA_DATA is changed.
2012-01-05 22:22:28 +00:00
Ray Speth
3062ddf621 Added 'scons clean' target 2012-01-05 22:22:23 +00:00
Ray Speth
89a405006b Fixed problem with embedding manifests in Windows binaries 2012-01-05 22:22:13 +00:00
Ray Speth
fc57f75da7 WiX now generates a 64-bit MSI when appropriate 2012-01-05 22:22:08 +00:00
Ray Speth
c8e1f291fa Added installation options to WiX installer 2012-01-05 22:22:03 +00:00
Ray Speth
f645c4248c Fixes for building with the MS Platform SDK 2012-01-05 22:21:58 +00:00
Ray Speth
82bc960575 SCons builds a very basic Windows installer 2012-01-03 23:08:25 +00:00
Ray Speth
a650168f3e SCons 'msi' target builds an installer for the Python module 2012-01-03 23:08:18 +00:00
Ray Speth
084666bef3 First steps toward developing a Windows installer 2012-01-03 23:07:58 +00:00
Ray Speth
5343eea5f1 Added sane default compiler options for the Intel compiler 2011-12-23 16:48:33 +00:00
Ray Speth
c3ba91ca6f Fixed SCons compatibility with the Intel compiler
Still not working with the Python module.
2011-12-23 02:14:58 +00:00
Ray Speth
9552f5d5d2 Made check for libm more compiler-agnostic 2011-12-20 03:51:38 +00:00
Ray Speth
3238e90969 Don't install man pages on Windows 2011-12-15 00:04:16 +00:00
Ray Speth
5d135738cc Fixed sometimes requiring root permissions to build
When building with an install target in a system directory,
root permissions are now only required to run "scons install".
2011-12-15 00:04:12 +00:00
Ray Speth
8e1cdc4ce4 Fixed attempt to link against libm with MSVC 2011-12-15 00:04:08 +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
ccaf3f5e08 Move config.h out of the main directory 2011-12-14 19:41:07 +00:00
Ray Speth
9ce489efc6 Move SCons builders to the site_scons directory 2011-12-14 19:40:57 +00:00
Ray Speth
bb82aa88ef Automatically detect Sundials version 2011-12-14 19:36:44 +00:00
Ray Speth
605efec48d SCons can now build the Matlab toolbox under Windows 2011-12-14 19:36:31 +00:00
Ray Speth
6ff532ed71 Fixed compiler flag handling to avoid saving unmodified defaults 2011-12-14 19:35:15 +00:00
Ray Speth
53c5bb6a4e Fixed handling of user-specified Sundials paths 2011-12-14 19:35:11 +00:00
Ray Speth
4308ebf40d Eliminated warnings caused by passing the -ftemplate-depth parameter to the C compiler 2011-12-14 19:35:07 +00:00
Ray Speth
c677ea5cbd Added default debug / release compiler flags for GCC and MSVC 2011-12-14 19:35:03 +00:00
Ray Speth
eca26c245c Fixed escaping of CANTERA_DATA in config.h 2011-12-14 19:34:59 +00:00
Ray Speth
49ee5391e0 Fixed building / installation of Python module in Windows 2011-12-14 19:34:53 +00:00
Ray Speth
508b71fecd Improved compiler configuration when using Visual Studio 2011-12-14 19:34:48 +00:00
Ray Speth
b0d75cafea Fixed discovery of Numpy directories under Windows 2011-12-14 19:34:43 +00:00