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

Merge topic 'codelite-simplify' 

c8e565a0 CodeLite generator: simplify code a bit
This commit is contained in:
Brad King 2014-04-17 09:11:03 -04:00 committed by CMake Topic Stage
parent 4c966d90c7 c8e565a06e
commit d9e2cd258c
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmExtraCodeLiteGenerator.cxx
View File

@ -443,26 +443,22 @@ cmExtraCodeLiteGenerator::GetConfigurationName(const cmMakefile* mf) const
std::string std::string
cmExtraCodeLiteGenerator::GetBuildCommand(const cmMakefile* mf) const cmExtraCodeLiteGenerator::GetBuildCommand(const cmMakefile* mf) const
{ {
std::stringstream ss;
std::string generator = mf->GetSafeDefinition("CMAKE_GENERATOR"); std::string generator = mf->GetSafeDefinition("CMAKE_GENERATOR");
std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
std::string buildCommand = make; // Default std::string buildCommand = make; // Default
if ( generator == "NMake Makefiles" ) if ( generator == "NMake Makefiles" ||
generator == "Ninja" )
{ {
buildCommand = make; buildCommand = make;
} }
else if ( generator == "MinGW Makefiles" || else if ( generator == "MinGW Makefiles" ||
generator == "Unix Makefiles" ) generator == "Unix Makefiles" )
{ {
std::stringstream ss;
ss << make << " -j " << this->CpuCount; ss << make << " -j " << this->CpuCount;
buildCommand = ss.str(); buildCommand = ss.str();
} }
else if ( generator == "Ninja" ) return buildCommand;
{
ss << make;
buildCommand = ss.str();
}
return buildCommand;
} }
std::string std::string