Index: cmFindPackageCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindPackageCommand.cxx,v
retrieving revision 1.41
diff -b -u -p -r1.41 cmFindPackageCommand.cxx
--- cmFindPackageCommand.cxx	12 Aug 2008 23:01:04 -0000	1.41
+++ cmFindPackageCommand.cxx	5 Sep 2008 22:15:53 -0000
@@ -411,7 +411,7 @@ bool cmFindPackageCommand
       {
       // Set a variable telling the find script this component
       // is required.
-      std::string req_var = Name + "_FIND_REQUIRED_" + args[i];
+      std::string req_var = this->Name + "_FIND_REQUIRED_" + args[i];
       this->Makefile->AddDefinition(req_var.c_str(), "1");
 
       // Append to the list of required components.
@@ -480,9 +480,7 @@ bool cmFindPackageCommand
       }
     }
 
-  // Store the list of components.
-  std::string components_var = Name + "_FIND_COMPONENTS";
-  this->Makefile->AddDefinition(components_var.c_str(), components.c_str());
+  this->SetModuleVariables(components);
 
   // See if there is a Find<package>.cmake module.
   if(!this->NoModule)
@@ -533,15 +531,14 @@ bool cmFindPackageCommand
   return result;
 }
 
+
 //----------------------------------------------------------------------------
-bool cmFindPackageCommand::FindModule(bool& found)
+bool cmFindPackageCommand::SetModuleVariables(const std::string& components)
 {
-  std::string module = "Find";
-  module += this->Name;
-  module += ".cmake";
-  std::string mfile = this->Makefile->GetModulesFile(module.c_str());
-  if ( mfile.size() )
-    {
+  // Store the list of components.
+  std::string components_var = this->Name + "_FIND_COMPONENTS";
+  this->Makefile->AddDefinition(components_var.c_str(), components.c_str());
+   
     if(this->Quiet)
       {
       // Tell the module that is about to be read that it should find
@@ -594,7 +591,18 @@ bool cmFindPackageCommand::FindModule(bo
       this->Makefile->AddDefinition(exact.c_str(),
                                     this->VersionExact? "1":"0");
       }
+}
+
 
+//----------------------------------------------------------------------------
+bool cmFindPackageCommand::FindModule(bool& found)
+{
+  std::string module = "Find";
+  module += this->Name;
+  module += ".cmake";
+  std::string mfile = this->Makefile->GetModulesFile(module.c_str());
+  if ( mfile.size() )
+    {
     // Load the module we found.
     found = true;
     return this->ReadListFile(mfile.c_str());
Index: cmFindPackageCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindPackageCommand.h,v
retrieving revision 1.22
diff -b -u -p -r1.22 cmFindPackageCommand.h
--- cmFindPackageCommand.h	12 Aug 2008 23:01:04 -0000	1.22
+++ cmFindPackageCommand.h	5 Sep 2008 22:15:53 -0000
@@ -73,6 +73,7 @@ public:
 private:
   void AppendSuccessInformation();
   void AppendToProperty(const char* propertyName);
+  bool SetModuleVariables(const std::string& components);
   bool FindModule(bool& found);
   bool HandlePackageMode();
   void FindConfig();