mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmCommand refactor: cmIncludeGuardCommand

Browse Source
This commit is contained in:
Gabor Bencze
2019-08-02 18:35:08 +02:00
committed by Brad King
parent f42dad7a5e
commit ceab7bda44
3 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmIncludeGuardCommand.cxx
+6 -6
View File
@@ -50,11 +50,11 @@ bool CheckIncludeGuardIsSet(cmMakefile* mf, std::string const& includeGuardVar)
} // anonymous namespace
// cmIncludeGuardCommand
bool cmIncludeGuardCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status)
bool cmIncludeGuardCommand(std::vector<std::string> const& args,
cmExecutionStatus& status)
{
if (args.size() > 1) {
this->SetError(
status.SetError(
"given an invalid number of arguments. The command takes at "
"most 1 argument.");
return false;
@@ -69,15 +69,15 @@ bool cmIncludeGuardCommand::InitialPass(std::vector<std::string> const& args,
} else if (arg == "GLOBAL") {
scope = GLOBAL;
} else {
this->SetError("given an invalid scope: " + arg);
status.SetError("given an invalid scope: " + arg);
return false;
}
}
std::string includeGuardVar = GetIncludeGuardVariableName(
this->Makefile->GetDefinition("CMAKE_CURRENT_LIST_FILE"));
status.GetMakefile().GetDefinition("CMAKE_CURRENT_LIST_FILE"));
cmMakefile* const mf = this->Makefile;
cmMakefile* const mf = &status.GetMakefile();
switch (scope) {
case VARIABLE: