*** empty log message ***

Cantera/src/CMakeLists.txt

@@ -1 +1,2 @@
 add_subdirectory(base)
+add_subdirectory(thermo)

Cantera/src/thermo/CMakeLists.txt

@@ -0,0 +1,10 @@
+SET (CTTHERMO_SRCS State.cpp Elements.cpp Constituents.cpp Phase.cpp 
+             ThermoPhase.cpp IdealGasPhase.cpp ConstDensityThermo.cpp 
+             SpeciesThermoFactory.cpp ConstCpPoly.cpp 
+             Mu0Poly.cpp GeneralSpeciesThermo.cpp SurfPhase.cpp 
+             ThermoFactory.cpp phasereport.cpp  StoichSubstance.cpp 
+             PureFluidPhase.cpp LatticeSolidPhase.cpp LatticePhase.cpp)
+
+INCLUDE_DIRECTORIES (../base . )
+
+ADD_LIBRARY(ctthermo ${CTTHERMO_SRCS})

Cantera/src/thermo/LatticePhase.cpp

@@ -5,6 +5,9 @@
  * $Id$
  */
 
+#include "config.h"
+#ifdef WITH_LATTICE_SOLID
+
 #ifdef WIN32
 #pragma warning(disable:4786)
 #pragma warning(disable:4503)
@@ -124,6 +127,4 @@ namespace Cantera {
     }
 }
 
-
-
-
+#endif

Cantera/src/thermo/LatticePhase.h

@@ -14,6 +14,9 @@
 #ifndef CT_LATTICE_H
 #define CT_LATTICE_H
 
+#include "config.h"
+#ifdef WITH_LATTICE_SOLID
+
 #include "ct_defs.h"
 #include "mix_defs.h"
 #include "ThermoPhase.h"
@@ -148,3 +151,4 @@ namespace Cantera {
 }
 
 #endif
+#endif

Cantera/src/thermo/LatticeSolidPhase.cpp

@@ -10,6 +10,9 @@
 #pragma warning(disable:4503)
 #endif
 
+#include "config.h"
+#ifdef WITH_LATTICE_SOLID
+
 #include "ct_defs.h"
 #include "mix_defs.h"
 #include "LatticeSolidPhase.h"
@@ -230,6 +233,4 @@ namespace Cantera {
     }
 }
 
-
-
-
+#endif

Cantera/src/thermo/LatticeSolidPhase.h

@@ -14,12 +14,18 @@
 #ifndef CT_LATTICESOLID_H
 #define CT_LATTICESOLID_H
 
+#include "config.h"
+#ifdef WITH_LATTICE_SOLID
+
 #include "ct_defs.h"
+
 #include "mix_defs.h"
 #include "ThermoPhase.h"
 #include "SpeciesThermo.h"
 #include "utilities.h"
 
+
+
 namespace Cantera {
 
     class LatticePhase;
@@ -90,3 +96,4 @@ namespace Cantera {
 }
         
 #endif
+#endif

Cantera/src/thermo/PureFluidPhase.cpp

@@ -10,6 +10,8 @@
 #include "xml.h"
 #include "PureFluidPhase.h"
 
+#ifdef WITH_PURE_FLUIDS
+
 #include "../../../ext/tpx/Sub.h"
 #include "../../../ext/tpx/utils.h"
 
@@ -249,5 +251,4 @@ namespace Cantera {
 
 }
 
-
-
+#endif  // WITH_PURE_FLUIDS