From 1e09bc5dde0dd4419861e510ea339ecf98a580a0 Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Thu, 29 May 2003 11:14:05 -0400
Subject: [PATCH] ENH: Abstract pre configure check in a separate method

---
 Source/cmake.cxx | 16 +++++++++++++++-
 Source/cmake.h   |  3 +++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 3cf11498b4..9ddbb7a3cf 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -784,7 +784,7 @@ void cmake::SetGlobalGenerator(cmGlobalGenerator *gg)
   gg->SetCMakeInstance(this);
 }
 
-int cmake::Configure()
+int cmake::DoPreConfigureChecks()
 {
   // do a sanity check on some values
   if(m_CacheManager->GetCacheValue("CMAKE_HOME_DIRECTORY"))
@@ -806,6 +806,20 @@ int cmake::Configure()
       }
     }
   else
+    {
+    return 0;
+    }
+  return 1;
+}
+
+int cmake::Configure()
+{
+  int res = this->DoPreConfigureChecks();
+  if ( res < 0 )
+    {
+    return -2;
+    }
+  if ( !res )
     {
     m_CacheManager->AddCacheEntry("CMAKE_HOME_DIRECTORY", 
                                   this->GetHomeDirectory(),
diff --git a/Source/cmake.h b/Source/cmake.h
index 53f2b07676..f01c0656ca 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -235,6 +235,9 @@ class cmake
   cmVariableWatch* GetVariableWatch() { return m_VariableWatch; }
 
   void GetCommandDocumentation(std::vector<cmDocumentationEntry>&) const;
+
+  ///! Do all the checks before running configure
+  int DoPreConfigureChecks();
   
 protected:
   typedef std::map<cmStdString, cmCommand*> RegisteredCommandsMap;