[cmake-commits] hoffman committed cmCPackGenericGenerator.cxx 1.48 1.49

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv3215/Source/CPack

Modified Files:
	cmCPackGenericGenerator.cxx 
Log Message:
ENH: add CPACK_PROJECT_CONFIG_FILE option to CPack


Index: cmCPackGenericGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenericGenerator.cxx,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- cmCPackGenericGenerator.cxx	31 Oct 2007 12:50:17 -0000	1.48
+++ cmCPackGenericGenerator.cxx	31 Oct 2007 16:55:04 -0000	1.49
@@ -60,7 +60,6 @@
 //----------------------------------------------------------------------
 int cmCPackGenericGenerator::PrepareNames()
 {
-  this->SetOption("CPACK_GENERATOR", this->Name.c_str());
 
   std::string tempDirectory = this->GetOption("CPACK_PACKAGE_DIRECTORY");
   tempDirectory += "/_CPack_Packages/";
@@ -754,6 +753,15 @@
       "Cannot initialize the generator" << std::endl);
     return 0;
     }
+  // set the running generator name
+  this->SetOption("CPACK_GENERATOR", this->Name.c_str());
+  // Load the project specific config file
+  const char* config = 
+    this->GetOption("CPACK_PROJECT_CONFIG_FILE");
+  if(config)
+    { 
+    mf->ReadListFile(config);
+    }
   int result = this->InitializeInternal();
   if (cmSystemTools::GetErrorOccuredFlag())
     {