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

422 commits

Author SHA1 Message Date
Sebastian Pinnau
dda89663ea [SCons] Add yaml-cpp to shared libraries if building with system yaml-cpp 
If building Cantera with system_yamlcpp=y the yaml-cpp library needs to be
specified in the linker flags.

Fixes #668
 2019-08-01 18:10:00 -04:00
band-a-prend
674c37ce3c cantera: Sconstruct 'libdirname' env PathVariable 
Some distributions (e.g. Fedora/RHEL) use 'lib64' instead of 'lib'
on 64-bit systems or could use some other library directory name
instead of 'lib' depends on architecture and profile
(e.g. Gentoo 'libx32' on x32 profile).
If user didn't set 'libdirname' configuration variable then
set it to default value 'lib'

This commit is related to early closed issue:
https://github.com/Cantera/cantera/issues/318
 2019-06-28 15:25:41 -04:00
Ray Speth
c840142bff Bump version to 2.5.0a3 2019-06-27 18:29:21 -04:00
Ray Speth
a7aa6e721a Create YAML versions of input files as part of build process 2019-06-25 22:30:59 -04:00
Ray Speth
fdfbc58a1e [Input] Search current directory for referenced YAML input files 2019-06-25 22:30:59 -04:00
Ray Speth
d476ad8e59 Use Boost to demangle type names in AnyValue casting errors 2019-06-25 22:30:59 -04:00
Ray Speth
ed24198e63 Add option to compile yaml-cpp or use system library 2019-06-25 22:30:59 -04:00
Bryan W. Weber
142f533229 Correct flag and libs for OpenMP on macOS 
Apple's clang on macOS requires the libomp to link. Apple symlinks gcc
to clang, so it can't be detected as clang by executable name
 2019-06-17 10:29:20 -04:00
Ray Speth
ce9a17dd92 Bump version to 2.5.0a2 2019-02-25 09:14:33 -05:00
Ray Speth
442433ad37 [Doc] Note that setting blas_lapack_libs does not make Eigen optional 2018-12-02 23:54:52 -05:00
Nick
9f3dc70949 [SCons] Use RPATH for linking shared libraries 
Prevents issues with missing shared libraries at runtime on non-Windows
systems. Can be disabled by setting the SCons flag 'use_rpath_linkage=n'.
 2018-11-30 23:52:36 -05:00
Bryan W. Weber
7e56bbaafe
[SCons] Add documentation location to post-install message 2018-09-30 20:15:43 -04:00
Ray Speth
7142a7b0c4 [SCons] Do checks for full and minimal Python modules simultaneously 2018-09-19 17:59:59 -04:00
Ray Speth
0f1da269fc [SCons] Simplify handling of PYTHONPATH in the test suite 2018-09-19 17:59:59 -04:00
Ray Speth
9279e0828e [SCons] Expand environment variables and ~/ when used in cantera.conf 2018-09-19 17:59:59 -04:00
Ray Speth
43565c90f5 [SCons] Allow specifying non-absolute paths for 'python_cmd' 
This allows e.g. 'python_cmd=python3' without needing to know what
directory that actually comes from.
 2018-09-19 17:59:59 -04:00
Ray Speth
0707caaee6 [SCons] Check for a supported version of Python 2018-09-19 17:59:59 -04:00
Ray Speth
33591282f5 [SCons] Use Cython from the targeted copy of Python 
Use the Cython module from the Python installation specified by
'python_cmd', rather than the Python installation that is running
SCons. This allows complilation of Cantera for Python versions that
aren't supported by SCons (e.g. Python 3.4).
 2018-09-19 17:59:59 -04:00
Ray Speth
d6da006e3e [SCons] Only build the Python package for Python 3.x 2018-09-19 17:59:59 -04:00
Ray Speth
dcb7f34b4a [SCons] Remove non-functional python_array_home option 
This option has been broken since before Cantera 2.3.0, so must have
been unused.
 2018-09-19 17:59:59 -04:00
Ray Speth
9df98d6ac1 [SCons] show any unexpected output from command to check numpy version 2018-09-19 17:59:59 -04:00
Ray Speth
719dbcc650 Fix warnings about Cabinet::s_storage 
Recent versions of clang++ warn that instantiation of a templated variable is
required at a certain point where no definition is available. Declaring such a
definition to be available is fine with older versions of clang++ as well, but
causes linker errors with g++, so this change is only applied when using
clang++.
 2018-08-28 16:45:49 -04:00
Ray Speth
51263193de Bump version to 2.5.0a1 2018-08-28 16:45:49 -04:00
Ray Speth
f1d8d9b1b9 Bump version for 2.4.0 release 2018-08-20 18:52:09 -04:00
Bryan W. Weber
af4ccaee09 Fix typos in system_googletest build config option 2018-08-20 18:45:46 -04:00
Bryan W. Weber
ff91457b5a
Clean the correct folder after building the minimal Python interface 2018-08-20 15:06:54 -04:00
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