Commit graph

44 commits

Author SHA1 Message Date
Bryan W. Weber
bfa5a66ed3 [SCons] Remove fmt from linking
We use the header-only version of fmt now, so no need to link to the
compiled library.
2019-08-01 18:10:00 -04:00
Bryan W. Weber
c0f019407e [SCons] Link to yaml-cpp when using system libs
Similar to the system_sundials option, libyaml-cpp must be added to the
linker line when the system libraries are used.
2019-08-01 18:10:00 -04:00
Ray Speth
8e89bbb8d2 Add methods for accessing the git commit used when compiling 2017-01-20 22:43:56 -05:00
Ray Speth
17c1f9dc14 [SCons] Make definition of CANTERA_DATA local to application.cpp 2017-01-20 17:58:40 -05:00
Ray Speth
d7819af947 [SCons] Make versioning of cantera_shared optional
Also, disable by default on MinGW to work around a SCons bug
2016-11-25 23:42:00 -05:00
Ray Speth
9c44db371a [SCons] Fix option to build with PCH disabled 2016-11-11 23:06:35 -05:00
Ray Speth
145335880f [SCons] Move PCH-related files out of include to avoid installing them 2016-11-04 11:36:13 -04:00
Ray Speth
334b154eef [SCons] Prevent full rebuild after change to precompiled header 2016-11-02 18:36:50 -04:00
Ray Speth
2a8ac43308 [SCons] Add fmt.h to system.h and improve PCH dependency handling 2016-10-28 12:40:53 -04:00
Ray Speth
e3dfc35ca1 [SCons] Use precompiled header to speed up compilation with MSVC
Update Appveyor config to turn off debug info so PCH can be used
2016-10-28 12:05:46 -04:00
Ray Speth
cbcce07981 [SCons] Use precompiled header to speed up compilation with GCC/Clang 2016-10-27 19:59:35 -04:00
Ray Speth
908e620325 [SCons] Generate versioned shared objects for cantera_shared.so
See #318.
2016-07-25 14:42:45 -04:00
Ray Speth
9b318f3c90 [SCons] Always link cantera_shared to its dependencies
This is not strictly required on Linux, but it doesn't hurt.

See #318.
2016-07-25 14:42:45 -04:00
Ray Speth
d4ddabc76c Use system-installed version of fmt library if available
Resolves #348.
2016-07-05 14:17:01 -04:00
Ray Speth
df43a474cd [SCons] Modify build system to exclude unused Fortran and f2c code
Cantera no longer requires BLAS / LAPACK (but can use them if available), so it
is never necessary to compile any of the external Fortran or f2c-converted code.
2016-05-14 22:00:22 -04:00
Ray Speth
b4a1fb2db1 [SCons/Numerics] Use ext/sundials if system Sundials not installed 2015-11-23 16:53:20 -05:00
Ray Speth
f9375e1a09 Use locks/mutexes from the standard library instead of Boost.Thread
This eliminates the need to link against any of the compiled Boost libraries,
and means that we can always build in thread-safe mode
2015-10-17 18:58:50 -04:00
Ray Speth
7f847c3877 [SCons] Miscellaneous cleanup of SConstruct/SConscript files 2015-06-13 23:29:58 -04:00
Ray Speth
fb588d873b Remove deprecated / unfinished 'spectra' classes 2014-05-30 19:23:37 +00:00
Ray Speth
f46f755057 [SCons] Remove unnecessary include directories 2014-03-13 21:35:24 +00:00
Ray Speth
ea040e1a5e [SCons] Always link to static standard libraries with MinGW 2014-02-24 03:25:34 +00:00
Ray Speth
aad284cce7 [SCons] Fix library linking issues under Cygwin 2014-02-20 03:01:01 +00:00
Ray Speth
2a37111d33 [SCons] Add Boost libraries when building the shared library 2014-01-09 23:12:18 +00:00
Ray Speth
97ff4fa2a5 [SCons] Fix handling of blas_lapack_dir and boost_lib_dir
These need to be added to LIBPATH as entries in a list, otherwise
LIBPATH ends up concatenating the strings for each as a single entry.
2013-06-14 23:06:29 +00:00
Ray Speth
04fb86b1ea Added a new SCons configuration variable 'warning_flags'
This allows use of more extensive warning settings for the code that's actually
part of Cantera without generating excessive warnings on code automatically
generated code (e.g. f2c) or code that isn't part of Cantera proper (e.g. gtest,
libexecstream).
2012-11-14 21:07:03 +00:00
Ray Speth
021f66c755 Merge bug fixes from the 2.0 maintenance branch 2012-08-15 15:36:34 +00:00
Ray Speth
ee3e48b024 Fixed issues linking to libgfortran on OS X 2012-08-12 22:59:40 +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
88bb6fe679 Removed obsolete C++ Chemkin mechanism converter 2012-07-26 20:49:50 +00:00
Ray Speth
1fb14fc86a Skip building/installing some targets when layout=debian
Do not build the shared library.
Do not build csvdiff.
Do not install install_tsc
Do not install man pages (handled by debhelper)

Skip csvdiff for Debian package

More things not installed with Debian
2012-06-05 19:56:34 +00:00
Ray Speth
ec1abb55a1 Added debian file layout option 2012-06-05 19:56:30 +00:00
Ray Speth
a1641019dd Made dependency of Matlab extension on the Cantera library explicit 2012-04-11 17:37: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
287e4aa67e Fixed problems detecting and linking to Sundials on Windows 2012-04-04 18:44:11 +00:00
Ray Speth
559163d2ca Fixes to allow building the Matlab toolbox with MinGW 2012-03-07 00:50:58 +00:00
Ray Speth
8150f49c2c Simplified adding SCons build and install targets 2012-03-05 20:45:20 +00:00
Ray Speth
70cdd1be3e Made linking to Sundials libraries more consistent 2012-03-01 00:44:50 +00:00
Ray Speth
6195b488c2 Allow compilation of the Fortran 90 module with MinGW 2012-02-27 18:16:00 +00:00
Ray Speth
1ece5bcc3d Some changes to make SCons faster 2012-02-23 21:25:20 +00:00
Ray Speth
ee0fe68e16 Fixes for building shared libraries on OS X. 2012-02-23 21:24:48 +00:00
Ray Speth
055b6e5710 Fixed issues compiling with MinGW using SCons 2012-02-21 16:06:07 +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
2528df0f75 Reorganized source tree structure
These changes make it unnecessary to copy header files around during
the build process, which tends to confuse IDEs and debuggers. The
headers which comprise Cantera's external C++ interface are now in
the 'include' directory.

All of the samples and demos are now in the 'samples' subdirectory.
2012-02-12 02:27:14 +00:00
Renamed from Cantera/src/SConscript (Browse further)