Selaa lähdekoodia

Ninja: Pre-compute "CMakeCache.txt" build target name

Nicolas Despres 9 vuotta sitten
vanhempi
sitoutus
0397c92a15
2 muutettua tiedostoa jossa 4 lisäystä ja 2 poistoa
  1. 3 2
      Source/cmGlobalNinjaGenerator.cxx
  2. 1 0
      Source/cmGlobalNinjaGenerator.h

+ 3 - 2
Source/cmGlobalNinjaGenerator.cxx

@@ -489,6 +489,7 @@ void cmGlobalNinjaGenerator::Generate()
   this->OpenRulesFileStream();
 
   this->TargetAll = "all";
+  this->CMakeCacheFile = "CMakeCache.txt";
 
   this->PolicyCMP0058 =
     this->LocalGenerators[0]->GetMakefile()->GetPolicyStatus(
@@ -1040,7 +1041,7 @@ void cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream& os)
       }
     }
   }
-  knownDependencies.insert("CMakeCache.txt");
+  knownDependencies.insert(this->CMakeCacheFile);
 
   for (TargetAliasMap::const_iterator i = this->TargetAliases.begin();
        i != this->TargetAliases.end(); ++i) {
@@ -1168,7 +1169,7 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
       implicitDeps.push_back(this->ConvertToNinjaPath(*fi));
     }
   }
-  implicitDeps.push_back("CMakeCache.txt");
+  implicitDeps.push_back(this->CMakeCacheFile);
 
   std::sort(implicitDeps.begin(), implicitDeps.end());
   implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),

+ 1 - 0
Source/cmGlobalNinjaGenerator.h

@@ -400,6 +400,7 @@ private:
 
 private:
   std::string TargetAll;
+  std::string CMakeCacheFile;
 };
 
 #endif // ! cmGlobalNinjaGenerator_h