From 36d53fdb429c67dee1a0e6b569c453f10200aac2 Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Sat, 12 May 2007 17:16:15 +0000
Subject: [PATCH] *** empty log message ***

---
 Cantera/src/CMakeLists.txt               |  1 +
 Cantera/src/thermo/CMakeLists.txt        | 10 ++++++++++
 Cantera/src/thermo/LatticePhase.cpp      |  7 ++++---
 Cantera/src/thermo/LatticePhase.h        |  4 ++++
 Cantera/src/thermo/LatticeSolidPhase.cpp |  7 ++++---
 Cantera/src/thermo/LatticeSolidPhase.h   |  7 +++++++
 Cantera/src/thermo/PureFluidPhase.cpp    |  5 +++--
 7 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 Cantera/src/thermo/CMakeLists.txt

diff --git a/Cantera/src/CMakeLists.txt b/Cantera/src/CMakeLists.txt
index 1ad6a5575..c581103ec 100644
--- a/Cantera/src/CMakeLists.txt
+++ b/Cantera/src/CMakeLists.txt
@@ -1 +1,2 @@
 add_subdirectory(base)
+add_subdirectory(thermo)
diff --git a/Cantera/src/thermo/CMakeLists.txt b/Cantera/src/thermo/CMakeLists.txt
new file mode 100644
index 000000000..ecbd95d81
--- /dev/null
+++ b/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})
diff --git a/Cantera/src/thermo/LatticePhase.cpp b/Cantera/src/thermo/LatticePhase.cpp
index 1e2256d3b..36550f45f 100644
--- a/Cantera/src/thermo/LatticePhase.cpp
+++ b/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
diff --git a/Cantera/src/thermo/LatticePhase.h b/Cantera/src/thermo/LatticePhase.h
index 736dd4e39..df8a7ec2f 100644
--- a/Cantera/src/thermo/LatticePhase.h
+++ b/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
diff --git a/Cantera/src/thermo/LatticeSolidPhase.cpp b/Cantera/src/thermo/LatticeSolidPhase.cpp
index 34a59f9d2..c01b9b8f9 100644
--- a/Cantera/src/thermo/LatticeSolidPhase.cpp
+++ b/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
diff --git a/Cantera/src/thermo/LatticeSolidPhase.h b/Cantera/src/thermo/LatticeSolidPhase.h
index c06938f15..d38500e9d 100644
--- a/Cantera/src/thermo/LatticeSolidPhase.h
+++ b/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
diff --git a/Cantera/src/thermo/PureFluidPhase.cpp b/Cantera/src/thermo/PureFluidPhase.cpp
index 17e3897b5..e46cdb8bc 100644
--- a/Cantera/src/thermo/PureFluidPhase.cpp
+++ b/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