Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-17 07:11:52 +08:00
Code Issues Projects Releases Wiki Activity

Ninja: Track when running to re-generate during a build

Browse Source 
Tell CMake explicitly when it is re-running inside a `ninja` invocation
to re-generate the build system.
This commit is contained in:
Brad King
2020-01-27 15:25:49 -05:00
parent b12b013028
commit 657820a00b
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmGlobalGenerator.cxx
View File

@@ -2525,6 +2525,7 @@ void cmGlobalGenerator::AddGlobalTarget_RebuildCache(
gti.PerConfig = false; gti.PerConfig = false;
cmCustomCommandLine singleLine; cmCustomCommandLine singleLine;
singleLine.push_back(cmSystemTools::GetCMakeCommand()); singleLine.push_back(cmSystemTools::GetCMakeCommand());
singleLine.push_back("--regenerate-during-build");
singleLine.push_back("-S$(CMAKE_SOURCE_DIR)"); singleLine.push_back("-S$(CMAKE_SOURCE_DIR)");
singleLine.push_back("-B$(CMAKE_BINARY_DIR)"); singleLine.push_back("-B$(CMAKE_BINARY_DIR)");
gti.CommandLines.push_back(std::move(singleLine)); gti.CommandLines.push_back(std::move(singleLine));

2
Source/cmGlobalNinjaGenerator.cxx
View File

@@ -1530,7 +1530,7 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
{ {
cmNinjaRule rule("RERUN_CMAKE"); cmNinjaRule rule("RERUN_CMAKE");
rule.Command = rule.Command =
cmStrCat(CMakeCmd(), " -S", cmStrCat(CMakeCmd(), " --regenerate-during-build -S",
lg->ConvertToOutputFormat(lg->GetSourceDirectory(), lg->ConvertToOutputFormat(lg->GetSourceDirectory(),
cmOutputConverter::SHELL), cmOutputConverter::SHELL),
" -B", " -B",

2
Source/cmake.cxx
View File

@@ -663,6 +663,8 @@ void cmake::SetArgs(const std::vector<std::string>& args)
} else if ((i < args.size() - 1) && } else if ((i < args.size() - 1) &&
(arg.find("--check-stamp-list", 0) == 0)) { (arg.find("--check-stamp-list", 0) == 0)) {
this->CheckStampList = args[++i]; this->CheckStampList = args[++i];
} else if (arg == "--regenerate-during-build") {
this->RegenerateDuringBuild = true;
} }
#if defined(CMAKE_HAVE_VS_GENERATORS) #if defined(CMAKE_HAVE_VS_GENERATORS)
else if ((i < args.size() - 1) && else if ((i < args.size() - 1) &&

3
Source/cmake.h
View File

@@ -547,6 +547,8 @@ public:
} }
cmStateSnapshot GetCurrentSnapshot() const { return this->CurrentSnapshot; } cmStateSnapshot GetCurrentSnapshot() const { return this->CurrentSnapshot; }
bool GetRegenerateDuringBuild() const { return this->RegenerateDuringBuild; }
protected: protected:
void RunCheckForUnusedVariables(); void RunCheckForUnusedVariables();
int HandleDeleteCacheVariables(const std::string& var); int HandleDeleteCacheVariables(const std::string& var);
@@ -621,6 +623,7 @@ private:
FileExtensions FortranFileExtensions; FileExtensions FortranFileExtensions;
bool ClearBuildSystem = false; bool ClearBuildSystem = false;
bool DebugTryCompile = false; bool DebugTryCompile = false;
bool RegenerateDuringBuild = false;
std::unique_ptr<cmFileTimeCache> FileTimeCache; std::unique_ptr<cmFileTimeCache> FileTimeCache;
std::string GraphVizFile; std::string GraphVizFile;
InstalledFilesMap InstalledFiles; InstalledFilesMap InstalledFiles;