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

Merge topic 'EclipseParallelMakeForBuildProject' 

414bf67 Eclipse: parallel build also for "Build project" #13287
This commit is contained in:
David Cole 2012-06-14 16:29:08 -04:00 committed by CMake Topic Stage
parent 2d1c25d179 414bf6732b
commit 88115fe9b1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmExtraEclipseCDT4Generator.cxx
View File

@ -286,6 +286,9 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
// set the make command // set the make command
std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
const std::string makeArgs = mf->GetSafeDefinition(
"CMAKE_ECLIPSE_MAKE_ARGUMENTS");
fout << fout <<
"\t\t\t\t<dictionary>\n" "\t\t\t\t<dictionary>\n"
"\t\t\t\t\t<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>\n" "\t\t\t\t\t<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>\n"
@ -293,7 +296,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
"\t\t\t\t</dictionary>\n" "\t\t\t\t</dictionary>\n"
"\t\t\t\t<dictionary>\n" "\t\t\t\t<dictionary>\n"
"\t\t\t\t\t<key>org.eclipse.cdt.make.core.build.command</key>\n" "\t\t\t\t\t<key>org.eclipse.cdt.make.core.build.command</key>\n"
"\t\t\t\t\t<value>" + this->GetEclipsePath(make) + "</value>\n" "\t\t\t\t\t<value>" << this->GetEclipsePath(make) << "</value>\n"
"\t\t\t\t</dictionary>\n" "\t\t\t\t</dictionary>\n"
"\t\t\t\t<dictionary>\n" "\t\t\t\t<dictionary>\n"
"\t\t\t\t\t<key>org.eclipse.cdt.make.core.contents</key>\n" "\t\t\t\t\t<key>org.eclipse.cdt.make.core.contents</key>\n"
@ -305,7 +308,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
"\t\t\t\t</dictionary>\n" "\t\t\t\t</dictionary>\n"
"\t\t\t\t<dictionary>\n" "\t\t\t\t<dictionary>\n"
"\t\t\t\t\t<key>org.eclipse.cdt.make.core.build.arguments</key>\n" "\t\t\t\t\t<key>org.eclipse.cdt.make.core.build.arguments</key>\n"
"\t\t\t\t\t<value></value>\n" "\t\t\t\t\t<value>" << makeArgs << "</value>\n"
"\t\t\t\t</dictionary>\n" "\t\t\t\t</dictionary>\n"
"\t\t\t\t<dictionary>\n" "\t\t\t\t<dictionary>\n"
"\t\t\t\t\t<key>org.eclipse.cdt.make.core.buildLocation</key>\n" "\t\t\t\t\t<key>org.eclipse.cdt.make.core.buildLocation</key>\n"