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

cmGlobalNinjaGenerator: Save path to 'ninja' tool very early

Browse Source 
Keep it in a member variable for convenient reference.  Set the
value as soon as it is known.
This commit is contained in:
Brad King 2015-11-02 16:27:31 -05:00
parent 7748a02c3f
commit ed67f40522
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGlobalNinjaGenerator.cxx
View File

@ -585,6 +585,15 @@ void cmGlobalNinjaGenerator::Generate()
this->CloseBuildFileStream(); this->CloseBuildFileStream();
} }
void cmGlobalNinjaGenerator::FindMakeProgram(cmMakefile* mf)
{
this->cmGlobalGenerator::FindMakeProgram(mf);
if (const char* ninjaCommand = mf->GetDefinition("CMAKE_MAKE_PROGRAM"))
{
this->NinjaCommand = ninjaCommand;
}
}
void cmGlobalNinjaGenerator void cmGlobalNinjaGenerator
::EnableLanguage(std::vector<std::string>const& langs, ::EnableLanguage(std::vector<std::string>const& langs,
cmMakefile* mf, cmMakefile* mf,
@ -1260,9 +1269,8 @@ std::string cmGlobalNinjaGenerator::ninjaCmd() const
{ {
cmLocalGenerator* lgen = this->LocalGenerators[0]; cmLocalGenerator* lgen = this->LocalGenerators[0];
if (lgen) { if (lgen) {
return lgen->ConvertToOutputFormat( return lgen->ConvertToOutputFormat(this->NinjaCommand,
lgen->GetMakefile()->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"), cmLocalGenerator::SHELL);
cmLocalGenerator::SHELL);
} }
return "ninja"; return "ninja";
} }

4
Source/cmGlobalNinjaGenerator.h
View File

@ -320,7 +320,7 @@ protected:
private: private:
virtual std::string GetEditCacheCommand() const; virtual std::string GetEditCacheCommand() const;
virtual void FindMakeProgram(cmMakefile* mf);
void OpenBuildFileStream(); void OpenBuildFileStream();
void CloseBuildFileStream(); void CloseBuildFileStream();
@ -392,6 +392,8 @@ private:
typedef std::map<std::string, cmGeneratorTarget*> TargetAliasMap; typedef std::map<std::string, cmGeneratorTarget*> TargetAliasMap;
TargetAliasMap TargetAliases; TargetAliasMap TargetAliases;
std::string NinjaCommand;
}; };
#endif // ! cmGlobalNinjaGenerator_h #endif // ! cmGlobalNinjaGenerator_h