Przeglądaj źródła

cmGlobalGenerator: Add API for the configure step being finished.

Stephen Kelly 10 lat temu
rodzic
commit
b98f7712ea
2 zmienionych plików z 8 dodań i 0 usunięć
  1. 5 0
      Source/cmGlobalGenerator.cxx
  2. 3 0
      Source/cmGlobalGenerator.h

+ 5 - 0
Source/cmGlobalGenerator.cxx

@@ -72,6 +72,8 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
   this->ExtraGenerator = 0;
   this->CurrentMakefile = 0;
   this->TryCompileOuterMakefile = 0;
+
+  this->ConfigureDoneCMP0026 = false;
 }
 
 cmGlobalGenerator::~cmGlobalGenerator()
@@ -1110,9 +1112,12 @@ void cmGlobalGenerator::Configure()
       this->CMakeInstance->GetHomeOutputDirectory());
 
   // now do it
+  this->ConfigureDoneCMP0026 = false;
   dirMf->Configure();
   dirMf->EnforceDirectoryLevelRules();
 
+  this->ConfigureDoneCMP0026 = true;
+
   // Put a copy of each global target in every directory.
   cmTargets globalTargets;
   this->CreateDefaultGlobalTargets(&globalTargets);

+ 3 - 0
Source/cmGlobalGenerator.h

@@ -363,6 +363,8 @@ public:
   cmFileLockPool& GetFileLockPool() { return FileLockPool; }
 #endif
 
+  bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026; }
+
   std::string MakeSilentFlag;
 protected:
   typedef std::vector<cmLocalGenerator*> GeneratorVector;
@@ -520,6 +522,7 @@ protected:
   bool ForceUnixPaths;
   bool ToolSupportsColor;
   bool InstallTargetEnabled;
+  bool ConfigureDoneCMP0026;
 };
 
 #endif