ENH: More cleanups and add stgz header script, so it does not have to be hard-coded. Also, the user can overwrite it

1 files changed, 17 insertions, 1 deletions

diff --git a/Source/CPack/cmCPackGenericGenerator.cxx b/Source/CPack/cmCPackGenericGenerator.cxx
index 7d7975e..1f8aca6 100644
--- a/Source/CPack/cmCPackGenericGenerator.cxx
+++ b/Source/CPack/cmCPackGenericGenerator.cxx
@@ -532,10 +532,17 @@ int cmCPackGenericGenerator::ProcessGenerator()
 }
 
 //----------------------------------------------------------------------
-int cmCPackGenericGenerator::Initialize(const char* name, cmMakefile* mf)
+int cmCPackGenericGenerator::Initialize(const char* name, cmMakefile* mf,
+ const char* argv0)
 {
   this->MakefileMap = mf;
   this->Name = name;
+  if ( !this->FindRunningCMake(argv0) )
+    {
+    cmCPackLogger(cmCPackLog::LOG_ERROR,
+      "Cannot initialize the generator" << std::endl);
+    return 0;
+    }
   return this->InitializeInternal();
 }
 
@@ -762,6 +769,15 @@ std::string cmCPackGenericGenerator::FindTemplate(const char* name)
 }
 
 //----------------------------------------------------------------------
+bool cmCPackGenericGenerator::ConfigureString(const std::string& inString,
+  std::string& outString)
+{
+  this->MakefileMap->ConfigureString(inString,
+    outString, true, false);
+  return true;
+}
+
+//----------------------------------------------------------------------
 bool cmCPackGenericGenerator::ConfigureFile(const char* inName,
   const char* outName)
 {