Commit graph

396 commits

Author SHA1 Message Date
Ray Speth
e7a48375dc Bump version to 2.4.0b2 2018-08-10 22:51:18 -04:00
Ray Speth
333d388f90 [SCons] Improve transition from system_googletest to googletest option 2018-07-09 15:24:25 -04:00
band-a-prend
fb4a36b1ca [SCons] implement 'googletest' option
New scons build option introduced to replace 'system_googletest'
and allow to not use 'googletest' module while running test
(all tests that require this module could be omited)

New option description:
'googletest',

"""Select whether to use gtest/gmock from system
   installation ('system'), from a Git submodule ('submodule'), to decide
   automatically ('default') or don't look for gtest/gmock ('none')
   and don't run tests that depend on gtest/gmock.
   If this option is set then it suppress the deprecated 'system_googletest' option."""

Old option is still presented and mentioned as 'deprecated'.
Option 'googletest' supresses the old 'system_googletest' one.
2018-07-09 15:24:25 -04:00
Ray Speth
309871ae88 Use header-only form of libfmt
Avoids problems when trying to link to static versions of libfmt.a which were
built without -fPIC.
2018-05-30 14:16:27 -04:00
Bryan W. Weber
51d0d43a45 [fmt] Bump fmt submodule to version 5.0.0 2018-05-30 14:16:27 -04:00
Bryan W. Weber
e42b952a8a [SCons] Add INFO output for Eigen
Prints whether system or private installation is used and the version of
Eigen
2018-05-30 14:16:27 -04:00
Bryan W. Weber
c8305375ef
[SCons] Remove <> from unknown git commit string
The shell was interpreting these as redirect operators during compilation
2018-05-23 17:36:22 -04:00
Bryan W. Weber
3fac5f2bc6
[SCons] Catch any Exception when checking git commit fails
It doesn't matter why the check failed, just that it did and we don't know
the commit
2018-05-23 17:35:49 -04:00
Ray Speth
d28032e845 Bump development version to 2.4.0b1 2018-02-15 23:59:59 -05:00
Ray Speth
322b1fc375 Update Sundials submodule to Sundials 3.1.0 2018-02-14 22:22:42 -05:00
Ray Speth
9c50f7528c Add support for Sundials 3.1.0 (also 3.0.0) 2018-02-14 22:22:42 -05:00
Ray Speth
50a3fecb23 Rename Sundials-related macros to avoid name conflicts 2018-02-14 22:22:42 -05:00
Bryan W. Weber
4e6af27edf [SCons] Remove the error when python_package and pythonX_package match
Make it a warning instead of an error
2017-12-18 15:47:03 -05:00
Bryan W. Weber
5d599bb680 [SCons] Configure the minimal Python interface build
Adds a new internal-only option for the pythonX_package variables,
'minimal-default'. This value is set when pythonX_package has not been
configured by the user (i.e., it started as default) and checking for
Cython or NumPy fails, so we can't build the full interface.
2017-12-18 15:47:03 -05:00
Bryan W. Weber
9c9ee9e919 [SCons] If python_package is set to default, print fewer warnings
If python_package is default and pythonX_package is present (where X is
the same version of Python as python_package), prefer the
pythonX_package options and don't warn quite so much
2017-12-18 15:47:03 -05:00
Bryan W. Weber
9f4590bc6f [SCons] Switch the order of python version and cython checks
Check for the python_package version of Python and configure the
pythonX_package option before checking for Cython
2017-12-18 15:47:03 -05:00
Bryan W. Weber
c233ddcd30 If both pythonX_package options are set ignore the python_package option 2017-12-18 15:47:03 -05:00
Bryan W. Weber
43b42e9942 [SCons] Delete unnecessary python_message variable 2017-12-18 15:47:03 -05:00
Bryan W. Weber
f824b20fe2 The usersitepackages variable is not used anymore so don't set it 2017-12-18 15:47:03 -05:00
Ray Speth
6cd7bf160f Bump development version to 2.4.0a2 2017-12-06 10:52:59 -05:00
Bryan W. Weber
07409dea59
The conda GCC compilers aren't called gcc, they're called gnu-cc
Check for gnu-cc in the CC variable to catch this case
2017-12-03 09:23:44 -05:00
Bryan W. Weber
7054a7bb3d
If Cython can't be imported, the cython_version is undefined
This results in a NameError and building fails. Change to check for one
exception at a time, with the relevant error message.
2017-12-03 09:23:44 -05:00
Ray Speth
4a4886f63e Generate setup_cantera.csh for use with csh/tcsh
Resolves #453
2017-12-02 20:03:15 -05:00
Bryan W. Weber
2f03a1e531 Reformat postInstallMessage code to be easier to read in SConstruct 2017-11-26 16:48:40 -05:00
Bryan W. Weber
77ee76c5f3 Simplify checking for 3to2
Switch to importing the lib3to2 as a check, which is platform agnostic
and doesn't depend on how 3to2 was installed. Also, take advantage of
the fact that the 3to2 converter recurses by default to avoid spawning
a bunch of subprocesses. Finally, don't depend on the location of the
3to2 script and just use the library directly to do the conversion.
2017-11-26 16:48:40 -05:00
Bryan W. Weber
6ca67b4845 Update documentation for new Python configuration options 2017-11-26 16:48:40 -05:00
Bryan W. Weber
94ea9b585f Update SConstruct to recognize that Python 3 might be running SCons
Update and make more consistent the specification of Python package
building. Since SCons can be run by Python 3 now, we cannot assume that
the Python running SCons is Python 2. This changes a bunch of
assumptions in SConstruct about where things should be built or
installed. This commit addresses those assumptions by making the options
for Python 2 and Python 3 symmetric.
2017-11-26 16:48:40 -05:00
Bryan W. Weber
1635cd2e04 Use the minimal Python interface for tests when others are not built
If no full or minimal Python interface is being built, copy the minimal
interface into the build directory and use the sys.executable to run it,
so the tests that require CTML or CTI conversion can run.
2017-11-26 16:48:40 -05:00
Bryan W. Weber
d1f9b9393a Remove testing related files if test-clean is specified 2017-11-26 16:48:40 -05:00
Bryan W. Weber
16fd18315c Remove HAS_NO_PYTHON configuration variable
This variable is not needed since in the two places its used we do a
runtime check of the presence of the Python interface anyways
2017-11-26 16:48:40 -05:00
emccorkle
684262e945 [SCons] Fix Python 3.6 compatibility
The build was failing with:
  TypeError: 'mappingproxy' object does not support item assignment
2017-10-28 20:12:14 -04:00
Evan McCorkle
60d2075492 Update to gtest-1.8.0.
This release included the merger of gtest and gmock. Cantera is now
building gmock in addition to gtest in order to take advantage of
gmock matchers.
2017-10-28 20:07:14 -04:00
Ray Speth
7d0bc71448 [SCons] Make build scripts compatible with SCons 3.0.0 and Python 3 2017-10-05 13:48:54 -04:00
Ray Speth
3f69f6ac8a [SCons] Make issues importing NumPy easier to diagnose 2017-07-31 17:26:09 -04:00
Ray Speth
3d03795c4f [Python] Set minimum NumPy version to 1.8.1.
Minimum set based on a regression in NumPy 1.8.0 which affects the SolutionArray
class.

This makes Trusty Tahr (14.04) the oldest supported version of Ubuntu (using the
Ubuntu-provided NumPy package).

Resolves #445.
2017-07-30 14:39:57 -04:00
Bryan W. Weber
c125878a40
Disable external SUNDIALS libraries when building the Matlab toolbox
Resolves #431
2017-06-14 09:08:39 -04:00
Ray Speth
461b63e462 [SCons] Add option to pass flags to GTest 2017-02-22 22:18:40 -05:00
Ray Speth
70e10632d4 [SCons] Fix implicit dependencies on 'build' step
The 'install' and 'test' targets had some undeclared dependencies on the 'build'
target, such that running 'scons install' or 'scons test' without having first
run 'scons build' would result in incomplete installation or test failures,
respectively.

Fixes #432.
2017-02-17 11:51:12 -05:00
Ray Speth
66998a5ae1 [SCons] Keep SCons initial PATH when propagating PATH
Fixes errors on Windows when Visual Studio is not on the PATH but has been
found by SCons instead.
2017-02-12 17:39:13 -05:00
Ray Speth
eae9250f2e [SCons] Print propagated environment variables in 'verbose' mode 2017-02-11 16:39:00 -05:00
Ray Speth
3c82c3a6c6 [SCons] Propagate PATH environment variable by default 2017-02-11 16:36:44 -05:00
Ray Speth
e5edc319de [SCons] Fix propagation of user-specified environment variables
The listify function no splits on commas
2017-02-11 16:35:07 -05:00
Ray Speth
78d5809d6f [Samples] Add C++ OpenMP example 2017-01-28 15:07:15 -05:00
Ray Speth
8e89bbb8d2 Add methods for accessing the git commit used when compiling 2017-01-20 22:43:56 -05:00
Ray Speth
26651cc72c Bump development version to 2.4.0a1 2017-01-20 16:16:32 -05:00
Ray Speth
4b974219b5 [SCons] Fix installation location for Debian Python packages 2017-01-12 20:23:58 -05:00
Ray Speth
6546c08f29 Bump version and copyright year for 2.3.0 release 2017-01-12 14:00:35 -05:00
Bryan W. Weber
4beaa1b19b [Doc] Clarify lapack_ftn_string_len_at_end docs 2017-01-12 13:43:39 -05:00
Bryan W. Weber
48f43cf015 [SCons/Doc] Update/reformat docs for SCons options 2017-01-12 13:43:39 -05:00
Ray Speth
e7923cedbb [SCons] Remove unnecessary configuration tests 2016-12-30 13:26:50 -05:00