浏览代码

QtAutogen: Port away from cmLocalGenerator.

Stephen Kelly 10 年之前
父节点
当前提交
1fe390201d
共有 1 个文件被更改,包括 7 次插入8 次删除
  1. 7 8
      Source/cmQtAutoGenerators.cxx

+ 7 - 8
Source/cmQtAutoGenerators.cxx

@@ -12,7 +12,7 @@
 ============================================================================*/
 ============================================================================*/
 
 
 #include "cmGlobalGenerator.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
+#include "cmOutputConverter.h"
 #include "cmMakefile.h"
 #include "cmMakefile.h"
 #include "cmSystemTools.h"
 #include "cmSystemTools.h"
 #include "cmState.h"
 #include "cmState.h"
@@ -179,19 +179,18 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory,
 
 
   cmState::Snapshot snapshot = cm.GetCurrentSnapshot();
   cmState::Snapshot snapshot = cm.GetCurrentSnapshot();
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, snapshot));
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, snapshot));
-  cmsys::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator(mf.get()));
-  lg->GetMakefile()->SetCurrentBinaryDirectory(targetDirectory);
-  lg->GetMakefile()->SetCurrentSourceDirectory(targetDirectory);
-  gg.SetCurrentMakefile(lg->GetMakefile());
+  mf->SetCurrentBinaryDirectory(targetDirectory);
+  mf->SetCurrentSourceDirectory(targetDirectory);
+  gg.SetCurrentMakefile(mf.get());
 
 
-  this->ReadAutogenInfoFile(lg->GetMakefile(), targetDirectory, config);
-  this->ReadOldMocDefinitionsFile(lg->GetMakefile(), targetDirectory);
+  this->ReadAutogenInfoFile(mf.get(), targetDirectory, config);
+  this->ReadOldMocDefinitionsFile(mf.get(), targetDirectory);
 
 
   this->Init();
   this->Init();
 
 
   if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5")
   if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5")
     {
     {
-    success = this->RunAutogen(lg->GetMakefile());
+    success = this->RunAutogen(mf.get());
     }
     }
 
 
   this->WriteOldMocDefinitionsFile(targetDirectory);
   this->WriteOldMocDefinitionsFile(targetDirectory);