kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGlobalUnixMakefileGenerator3: Host the PassMakeflags.

This commit is contained in:
Stephen Kelly 2015-05-16 05:20:58 +02:00
parent 14f171c3ba
commit a97df5e135
7 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalBorlandMakefileGenerator.cxx
View File

@ -24,6 +24,7 @@ cmGlobalBorlandMakefileGenerator::cmGlobalBorlandMakefileGenerator()
this->WindowsShell = true;
this->IncludeDirective = "!include";
this->DefineWindowsNULL = true;
this->PassMakeflags = true;
}
@ -46,7 +47,6 @@ cmLocalGenerator *cmGlobalBorlandMakefileGenerator::CreateLocalGenerator(
cmLocalUnixMakefileGenerator3* lg =
new cmLocalUnixMakefileGenerator3(this, parent);
lg->SetMakefileVariableSize(32);
lg->SetPassMakeflags(true);
lg->SetUnixCD(false);
lg->SetMakeCommandEscapeTargetTwice(true);
lg->SetBorlandMakeCurlyHack(true);

2
Source/cmGlobalJOMMakefileGenerator.cxx
View File

@ -22,6 +22,7 @@ cmGlobalJOMMakefileGenerator::cmGlobalJOMMakefileGenerator()
this->WindowsShell = true;
this->NMake = true;
this->DefineWindowsNULL = true;
this->PassMakeflags = true;
}
void cmGlobalJOMMakefileGenerator
@ -55,7 +56,6 @@ cmGlobalJOMMakefileGenerator::CreateLocalGenerator(cmLocalGenerator* parent)
= new cmLocalUnixMakefileGenerator3(this, parent);
lg->SetMakeSilentFlag("/nologo");
lg->SetIgnoreLibPrefix(true);
lg->SetPassMakeflags(true);
lg->SetUnixCD(false);
return lg;
}

2
Source/cmGlobalNMakeMakefileGenerator.cxx
View File

@ -22,6 +22,7 @@ cmGlobalNMakeMakefileGenerator::cmGlobalNMakeMakefileGenerator()
this->WindowsShell = true;
this->NMake = true;
this->DefineWindowsNULL = true;
this->PassMakeflags = true;
}
void cmGlobalNMakeMakefileGenerator
@ -55,7 +56,6 @@ cmGlobalNMakeMakefileGenerator::CreateLocalGenerator(cmLocalGenerator* parent)
new cmLocalUnixMakefileGenerator3(this, parent);
lg->SetMakeSilentFlag("/nologo");
lg->SetIgnoreLibPrefix(true);
lg->SetPassMakeflags(true);
lg->SetUnixCD(false);
return lg;
}

1
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -36,6 +36,7 @@ cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3()
this->IncludeDirective = "include";
this->DefineWindowsNULL = false;
this->PassMakeflags = false;
}
void cmGlobalUnixMakefileGenerator3

1
Source/cmGlobalUnixMakefileGenerator3.h
View File

@ -135,6 +135,7 @@ public:
std::string IncludeDirective;
bool DefineWindowsNULL;
bool PassMakeflags;
protected:
void WriteMainMakefile2();
void WriteMainCMakefile();

5
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -85,7 +85,6 @@ cmLocalUnixMakefileGenerator3(cmGlobalGenerator* gg, cmLocalGenerator* parent)
{
this->MakefileVariableSize = 0;
this->IgnoreLibPrefix = false;
this->PassMakeflags = false;
this->UnixCD = true;
this->ColorMakefile = false;
this->SkipPreprocessedSourceRules = false;
@ -2154,7 +2153,9 @@ cmLocalUnixMakefileGenerator3
// sub-invoked makes via an environment variable. However, some
// makes do not support that, so you have to pass the flags
// explicitly.
if(this->GetPassMakeflags())
cmGlobalUnixMakefileGenerator3* gg =
static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
if(gg->PassMakeflags)
{
cmd += "-$(MAKEFLAGS) ";
}

9
Source/cmLocalUnixMakefileGenerator3.h
View File

@ -66,14 +66,6 @@ public:
// write the main variables used by the makefiles
void WriteMakeVariables(std::ostream& makefileStream);
/**
* If true, then explicitly pass MAKEFLAGS on the make all target for makes
* that do not use environment variables.
*
*/
void SetPassMakeflags(bool s){this->PassMakeflags = s;}
bool GetPassMakeflags() { return this->PassMakeflags; }
/**
* Set the flag used to keep the make program silent.
*/
@ -291,7 +283,6 @@ private:
std::string MakeSilentFlag;
std::string ConfigurationName;
bool UnixCD;
bool PassMakeflags;
bool MakeCommandEscapeTargetTwice;
bool BorlandMakeCurlyHack;
//==========================================================================