[Cmake-commits] CMake branch, next, updated. v2.8.8-3147-g9c05d34

[Alexander Neundorf]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9c05d34c5ca8927250d0c783981549cbf33e0795 (commit)
       via  414bf6732bf504d200b5c00490f160271e5b1b50 (commit)
      from  fbfed8156e43f5897a08b2b3a3fb6fdffb9e9dca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c05d34c5ca8927250d0c783981549cbf33e0795
commit 9c05d34c5ca8927250d0c783981549cbf33e0795
Merge: fbfed81 414bf67
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Jun 13 16:51:59 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 13 16:51:59 2012 -0400

    Merge topic 'EclipseParallelMakeForBuildProject' into next
    
    414bf67 Eclipse: parallel build also for "Build project" #13287


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=414bf6732bf504d200b5c00490f160271e5b1b50
commit 414bf6732bf504d200b5c00490f160271e5b1b50
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Jun 13 22:49:45 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Jun 13 22:49:45 2012 +0200

    Eclipse: parallel build also for "Build project" #13287
    
    Use ${CMAKE_ECLIPSE_MAKE_ARGUMENTS} also for the overall build command,
    not only for the per-target commands.
    
    Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 65077b3..dc9eb6a 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -286,6 +286,9 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 
   // set the make command
   std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
+  const std::string makeArgs = mf->GetSafeDefinition(
+                                               "CMAKE_ECLIPSE_MAKE_ARGUMENTS");
+
   fout <<
     "\t\t\t\t<dictionary>\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\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\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\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\t<key>org.eclipse.cdt.make.core.buildLocation</key>\n"

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake