reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-01-22 03:16:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VS: Do not print message when generate.stamp is up-to-date.

Browse Source 
Fixes: #16783
This commit is contained in:
Olli Kallioinen 2019-03-02 23:37:21 +02:00 committed by Brad King
parent 26068d2db8
commit 67428e9025
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmake.cxx
View File

@ -116,10 +116,8 @@ typedef std::unordered_map<std::string, Json::Value> JsonValueMapType;
} // namespace } // namespace
static bool cmakeCheckStampFile(const std::string& stampName, static bool cmakeCheckStampFile(const std::string& stampName);
bool verbose = true); static bool cmakeCheckStampList(const std::string& stampList);
static bool cmakeCheckStampList(const std::string& stampList,
bool verbose = true);
void cmWarnUnusedCliWarning(const std::string& variable, int /*unused*/, void cmWarnUnusedCliWarning(const std::string& variable, int /*unused*/,
void* ctx, const char* /*unused*/, void* ctx, const char* /*unused*/,
@ -2410,7 +2408,7 @@ int cmake::GetSystemInformation(std::vector<std::string>& args)
return 0; return 0;
} }
static bool cmakeCheckStampFile(const std::string& stampName, bool verbose) static bool cmakeCheckStampFile(const std::string& stampName)
{ {
// The stamp file does not exist. Use the stamp dependencies to // The stamp file does not exist. Use the stamp dependencies to
// determine whether it is really out of date. This works in // determine whether it is really out of date. This works in
@ -2462,13 +2460,7 @@ static bool cmakeCheckStampFile(const std::string& stampName, bool verbose)
stamp << "# CMake generation timestamp file for this directory.\n"; stamp << "# CMake generation timestamp file for this directory.\n";
} }
if (cmSystemTools::RenameFile(stampTemp, stampName)) { if (cmSystemTools::RenameFile(stampTemp, stampName)) {
if (verbose) { // CMake does not need to re-run because the stamp file is up-to-date.
// Notify the user why CMake is not re-running. It is safe to
// just print to stdout here because this code is only reachable
// through an undocumented flag used by the VS generator.
std::cout << "CMake does not need to re-run because " << stampName
<< " is up-to-date.\n";
}
return true; return true;
} }
cmSystemTools::RemoveFile(stampTemp); cmSystemTools::RemoveFile(stampTemp);
@ -2476,7 +2468,7 @@ static bool cmakeCheckStampFile(const std::string& stampName, bool verbose)
return false; return false;
} }
static bool cmakeCheckStampList(const std::string& stampList, bool verbose) static bool cmakeCheckStampList(const std::string& stampList)
{ {
// If the stamp list does not exist CMake must rerun to generate it. // If the stamp list does not exist CMake must rerun to generate it.
if (!cmSystemTools::FileExists(stampList)) { if (!cmSystemTools::FileExists(stampList)) {
@ -2494,7 +2486,7 @@ static bool cmakeCheckStampList(const std::string& stampList, bool verbose)
// Check each stamp. // Check each stamp.
std::string stampName; std::string stampName;
while (cmSystemTools::GetLineFromStream(fin, stampName)) { while (cmSystemTools::GetLineFromStream(fin, stampName)) {
if (!cmakeCheckStampFile(stampName, verbose)) { if (!cmakeCheckStampFile(stampName)) {
return false; return false;
} }
} }
@ -2615,7 +2607,7 @@ int cmake::Build(int jobs, const std::string& dir, const std::string& target,
} }
} }
if (!cmakeCheckStampList(stampList, false)) { if (!cmakeCheckStampList(stampList)) {
// Correctly initialize the home (=source) and home output (=binary) // Correctly initialize the home (=source) and home output (=binary)
// directories, which is required for running the generation step. // directories, which is required for running the generation step.
std::string homeOrig = this->GetHomeDirectory(); std::string homeOrig = this->GetHomeDirectory();