research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added version control information to winconfig.h

Browse source
This commit is contained in:
Harry Moffat 2010-05-08 18:06:27 +00:00
parent d2a6042f7f
commit 1611b87155
4 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Cantera/cxx/include/Cantera.mak.in
View file

@ -22,9 +22,9 @@
# build tree environment or in the install tree environment.
#
in_CanteraBuildTree = 0
#
CANTERA_VERSION=@ctversion@
#
###############################################################################
# CANTERA CORE
###############################################################################
@ -140,7 +140,6 @@ CANTERA_TOTAL_LIBS_DEP= $(CANTERA_CORE_LIBS_DEP) \
$(CANTERA_CVODE_LIBS_DEP) \
$(CANTERA_BLAS_LAPACK_LIBS_DEP)
#
#
# Dependency Line
#
CANTERA_LIBS_DEP= @INSTALL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a

11
Cantera/cxx/include/Cantera_bt.mak.in
View file

@ -22,9 +22,9 @@
# build tree environment or in the install tree environment.
#
in_CanteraBuildTree = 0
#
CANTERA_VERSION=@ctversion@
#
###############################################################################
# CANTERA CORE
###############################################################################
@ -112,18 +112,17 @@ CANTERA_F2C_LIBS= -L$(CANTERA_LIBSDIR) -lctf2c
else
CANTERA_F2C_LIBS= @F2C_SYSTEMLIB@
endif
#
#####################################################################
# COMBINATIONS OF INCLUDES AND LIBS
####################################################################
#
CANTERA_TOTAL_INCLUDES= $(CANTERA_CORE_INCLUDES) $(CANTERA_BOOST_INCLUDES) $(CANTERA_CVODE_INCLUDE)
#
# You can add this into the compilation environment to identify the version number
#
CANTERA_DEFINES = -DCANTERA_VERSION=@ctversion@
#
CANTERA_TOTAL_LIBS2 = @LOCAL_LIB_DIRS@ @LOCAL_LIBS@
CANTERA_TOTAL_LIBS= $(CANTERA_CORE_LIBS) $(CANTERA_BOOST_LIBS) \

5
config.h.in
View file

@ -5,10 +5,11 @@
#define CT_CONFIG_H
//---------------------------- Version Flags ------------------//
//
// Cantera version -> this will be a double-quoted string value
// refering to branch number within svn
#undef CANTERA_VERSION
//
// Integer for major number of Cantera
#define CANTERA_VERSION_MAJORNUMBER 18
// Flag indicating it's part of major version 18
@ -17,7 +18,7 @@
#define CANTERA_VERSION_18_XXX 1
// Flag indictaing that its part of 1.8_LiquidTransportDevelop branch
#define CANTERA_VERSION_18_LTD 1
//
//------------------------ Development flags ------------------//
//
// Compile in additional debug printing where available.

15
winconfig.h
View file

@ -5,6 +5,18 @@
#ifndef CT_CONFIG_H
#define CT_CONFIG_H
// Cantera version -> this will be a double-quoted string value
// refering to branch number within svn
#define CANTERA_VERSION "1.8_liquidTransportDevelop"
// Integer for major number of Cantera
#define CANTERA_VERSION_MAJORNUMBER 18
// Flag indicating it's part of major version 18
#define CANTERA_VERSION_18 1
// Flag indicating it's a development version
#define CANTERA_VERSION_18_XXX 1
// Flag indictaing that its part of 1.8_LiquidTransportDevelop branch
#define CANTERA_VERSION_18_LTD 1
//------------------------ Development flags ------------------//
//
@ -64,9 +76,6 @@ typedef int ftnlen; // Fortran hidden string length type
/* #undef DARWIN */
#define HAS_SSTREAM 1
// Cantera version
#define CANTERA_VERSION "1.8.0"
// Identify whether the operating system is cygwin's overlay of
// windows, with gcc being used as the compiler.
/* #undef CYGWIN */