From c90f7e9fbe45db083f4eb39a0087c6e2274f9915 Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Wed, 13 Feb 2008 06:10:50 +0000
Subject: [PATCH] *** empty log message ***

---
 CMakeLists.txt                    | 8 ++++----
 Cantera/cmake_install.cmake       | 4 ++--
 Cantera/src/thermo/CMakeLists.txt | 1 +
 Makefile.in                       | 1 +
 config.cmake                      | 2 +-
 ext/CMakeLists.txt                | 3 ---
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 851a75fdd..526134c02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,14 +9,14 @@ INCLUDE (config.cmake)
 #operating system
 SET(os ${CMAKE_SYSTEM_NAME})
 if (os STREQUAL "Darwin")
-    SET(DARWIN 1)
+      SET(DARWIN 1)
 endif (os STREQUAL "Darwin")
 
 if (PYTHON_CMD STREQUAL "default")
-   INCLUDE( FindPythonInterp )
-   SET( PYTHON_EXE ${PYTHON_EXECUTABLE} )
+     INCLUDE( FindPythonInterp )
+     SET( PYTHON_EXE ${PYTHON_EXECUTABLE} )
 else (PYTHON_CMD STREQUAL "default")
-  SET( PYTHON_EXE ${PYTHON_CMD} )
+    SET( PYTHON_EXE ${PYTHON_CMD} )
 endif (PYTHON_CMD STREQUAL "default")
 
 # configuration
diff --git a/Cantera/cmake_install.cmake b/Cantera/cmake_install.cmake
index 67bc76e17..3a31fd926 100644
--- a/Cantera/cmake_install.cmake
+++ b/Cantera/cmake_install.cmake
@@ -2,7 +2,7 @@
 
 # Set the install prefix
 IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  SET(CMAKE_INSTALL_PREFIX "/Applications/Cantera")
+  SET(CMAKE_INSTALL_PREFIX "/usr/local")
 ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
 STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 
@@ -12,7 +12,7 @@ IF(NOT CMAKE_INSTALL_CONFIG_NAME)
     STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
            CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
   ELSE(BUILD_TYPE)
-    SET(CMAKE_INSTALL_CONFIG_NAME "Release")
+    SET(CMAKE_INSTALL_CONFIG_NAME "")
   ENDIF(BUILD_TYPE)
   MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
 ENDIF(NOT CMAKE_INSTALL_CONFIG_NAME)
diff --git a/Cantera/src/thermo/CMakeLists.txt b/Cantera/src/thermo/CMakeLists.txt
index 94806e5af..5592d61cb 100644
--- a/Cantera/src/thermo/CMakeLists.txt
+++ b/Cantera/src/thermo/CMakeLists.txt
@@ -7,6 +7,7 @@ SET (THERMO_SRCS State.cpp Elements.cpp Constituents.cpp Phase.cpp
              StoichSubstance.cpp PureFluidPhase.cpp LatticeSolidPhase.cpp 
              LatticePhase.cpp)
 
+INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR}/build/include/cantera)
 INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
 
 SET (LIBRARY_OUTPUT_PATH 
diff --git a/Makefile.in b/Makefile.in
index 8091358c1..b7fd233b6 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,3 +1,4 @@
+
 export_dir = $(HOME)/sfdist
 version = @ctversion@
 ct = $(export_dir)/cantera-$(version)
diff --git a/config.cmake b/config.cmake
index 3059dd970..bd668a93f 100755
--- a/config.cmake
+++ b/config.cmake
@@ -1,7 +1,7 @@
 
 OPTION(CANTERA_BUILD_FULL_PYTHON "Include support for using Cantera from Python?" ON)
 
-OPTION(CANTERA_BUILD_WITH_F2C "Use f2c versions of 3rd party numerical routines" ON)
+OPTION(CANTERA_BUILD_WITH_F2C "Use f2c versions of 3rd party numerical routines" OFF)
 
 OPTION (CANTERA_BUILD_LAPACK  0)
 OPTION (CANTERA_HAVE_SUNDIALS 1)
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index 9947073bd..245264987 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -1,7 +1,4 @@
 SET (CMAKE_C_FLAGS  -DSkip_f2c_Undefs)
-add_subdirectory( f2c_libs) 
-add_subdirectory( f2c_blas)
-add_subdirectory (f2c_lapack)
 add_subdirectory ( tpx )