mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 06:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

file(INSTALL): Add undocumented options to control output verbosity

Browse Source 
Create options "MESSAGE_ALWAYS", "MESSAGE_LAZY", and "MESSAGE_NEVER" to
specify whether to print the "Installing" and "Up-to-date" messages.
Extend the RunCMake.file test with cases covering these options.
This commit is contained in:
Brad King
2014-06-24 11:42:39 -04:00
parent 464567a577
commit abebcd235c
7 changed files with 103 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Source/cmFileCommand.cxx
View File

@@ -1705,6 +1705,9 @@ struct cmFileInstaller: public cmFileCopier
cmFileCopier(command, "INSTALL"),
InstallType(cmInstallType_FILES),
Optional(false),
MessageAlways(false),
MessageLazy(false),
MessageNever(false),
DestDirLength(0)
{
// Installation does not use source permissions by default.
@@ -1726,6 +1729,9 @@ struct cmFileInstaller: public cmFileCopier
protected:
cmInstallType InstallType;
bool Optional;
bool MessageAlways;
bool MessageLazy;
bool MessageNever;
int DestDirLength;
std::string Rename;
@@ -1741,9 +1747,12 @@ protected:
virtual void ReportCopy(const char* toFile, Type type, bool copy)
{
std::string message = (copy? "Installing: " : "Up-to-date: ");
message += toFile;
this->Makefile->DisplayStatus(message.c_str(), -1);
if(!this->MessageNever && (copy || !this->MessageLazy))
{
std::string message = (copy? "Installing: " : "Up-to-date: ");
message += toFile;
this->Makefile->DisplayStatus(message.c_str(), -1);
}
if(type != TypeDir)
{
// Add the file to the manifest.
@@ -1829,6 +1838,16 @@ bool cmFileInstaller::Parse(std::vector<std::string> const& args)
return false;
}
if(((this->MessageAlways?1:0) +
(this->MessageLazy?1:0) +
(this->MessageNever?1:0)) > 1)
{
this->FileCommand->SetError("INSTALL options MESSAGE_ALWAYS, "
"MESSAGE_LAZY, and MESSAGE_NEVER "
"are mutually exclusive.");
return false;
}
return true;
}
@@ -1880,6 +1899,42 @@ bool cmFileInstaller::CheckKeyword(std::string const& arg)
this->Optional = true;
}
}
else if(arg == "MESSAGE_ALWAYS")
{
if(this->CurrentMatchRule)
{
this->NotAfterMatch(arg);
}
else
{
this->Doing = DoingNone;
this->MessageAlways = true;
}
}
else if(arg == "MESSAGE_LAZY")
{
if(this->CurrentMatchRule)
{
this->NotAfterMatch(arg);
}
else
{
this->Doing = DoingNone;
this->MessageLazy = true;
}
}
else if(arg == "MESSAGE_NEVER")
{
if(this->CurrentMatchRule)
{
this->NotAfterMatch(arg);
}
else
{
this->Doing = DoingNone;
this->MessageNever = true;
}
}
else if(arg == "PERMISSIONS")
{
if(this->CurrentMatchRule)