[Cmake-commits] CMake branch, next, updated. v2.8.6-1730-g768b869

[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  768b869bc84effce48a4cd7ac7a4ae858f869813 (commit)
       via  057633151a527fc614b56f4ca3fd73f63928ebff (commit)
      from  855155aa120ac3aeddcadc73ebf45bc2fb376efe (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=768b869bc84effce48a4cd7ac7a4ae858f869813
commit 768b869bc84effce48a4cd7ac7a4ae858f869813
Merge: 855155a 0576331
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Mon Oct 31 18:41:22 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 31 18:41:22 2011 -0400

    Merge topic 'FixTargetsInVirtualFoldersForEclipseIndigo' into next
    
    0576331 Eclipse: make targets work from any directory


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=057633151a527fc614b56f4ca3fd73f63928ebff
commit 057633151a527fc614b56f4ca3fd73f63928ebff
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Mon Oct 31 23:37:01 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Mon Oct 31 23:37:01 2011 +0100

    Eclipse: make targets work from any directory
    
    Set the working directory for make targets which are associated
    to virtual folders, otherwise Eclipse simply runs make from the
    current working directory (where Eclipse has been started), and
    where probably not the correct makefile is located.
    
    Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 785e85a..eab149e 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -998,7 +998,11 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           std::string virtDir = "[Targets]/";
           virtDir += prefix;
           virtDir += ti->first;
-          this->AppendTarget(fout, "Build", make, makeArgs, virtDir, "",
+          std::string buildArgs = "-C ";
+          buildArgs += makefile->GetHomeOutputDirectory();
+          buildArgs += " ";
+          buildArgs += makeArgs;
+          this->AppendTarget(fout, "Build", make, buildArgs, virtDir, "",
                              ti->first.c_str());
 
           std::string cleanArgs = "-E chdir \"";

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

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


hooks/post-receive
-- 
CMake