research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2880 commits 2 branches 16 tags 37 MiB
Commit graph

64 commits

Author SHA1 Message Date
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
Ray Speth
b78fa7c9de Build clib as a shared library 2011-12-14 19:34:36 +00:00
Ray Speth
96f93bbac7 Use Boost.Math to provide 'erf' when it is not provided by math.h 2011-12-14 19:34:28 +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
098501cbe4 Fixed several platform-dependent preprocessor defines to work with Windows 2011-12-14 19:33:53 +00:00
Ray Speth
6c3e29bac1 Fixed several compiler options and paths to work properly with MSVC/Windows 2011-12-14 19:33:42 +00:00
Ray Speth
ff878fc826 "equil" compilation now includes C source files 
This fixes compilation with the VCS non-ideal phase option
 2011-12-14 05:55:01 +00:00
Ray Speth
a9028d6b77 Added test building and running capabilities to SCons scripts 2011-12-14 05:54:56 +00:00
Ray Speth
fc98029905 Removed redundant configuration option "enable_rxnpath" 2011-12-14 05:54:52 +00:00
Ray Speth
7c807e7925 Combined redundant configuration options for "with_pure_fluids" 
Eliminated enable_tpx, incl_pure_fluids
 2011-12-14 05:54:48 +00:00
Ray Speth
1c99031360 Improved end-user help for using SCons 
Added descriptions of all of the configuration options to the
SConstruct file, and a special "help" target that prints a formatted
version of the options. Running scons with no target now prints a
usage help message.
 2011-12-14 03:54:08 +00:00
Ray Speth
ecd99dc7ad Removed some deprecated configuration options 2011-12-14 03:54:04 +00:00
Ray Speth
38170a18ed Better default behavior when building the Fortran interface with Scons 
SCons automatically checks for a Fortran compiler, and builds the
Fortran module if one is found, or if the path to a compiler is given
as a configuration option. An error is generated if the F90 interface
is required and a compiler cannot be found.
 2011-12-14 03:54:00 +00:00
Ray Speth
0982600bcd Better default behavior for building the Matlab toolbox with SCons 
If Matlab is found on the path, build the toolbox by default,
otherwise skip it. If the toolbox is required and Matlab can't be
found, exit with an error.
 2011-12-14 03:53:56 +00:00
Ray Speth
79b7686e63 More robust installation of the Python package with SCons 
SCons now checks for an array package (numpy by default) and builds
the full Python module if it finds it, otherwise it builds the minimal
package.
 2011-12-14 03:53:50 +00:00
Ray Speth
871c7f62f1 SCons prints a post-install summary 2011-12-14 03:53:46 +00:00