[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7556-gccde695

[Stephen Kelly]

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  ccde695ba8a16cea8554a0a41e41efc6181013e0 (commit)
       via  311c0b9897bd1128eae3ba1af2eaa5dd41025d91 (commit)
      from  d2aa6a42b212e0d71b69db05e045472ad57e8249 (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=ccde695ba8a16cea8554a0a41e41efc6181013e0
commit ccde695ba8a16cea8554a0a41e41efc6181013e0
Merge: d2aa6a4 311c0b9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 10 03:00:10 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 10 03:00:10 2014 -0500

    Merge topic 'eclipse-hotfix' into next
    
    311c0b98 Eclipse: Skip generator expressions in COMPILE_DEFINITIONS (#14722)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=311c0b9897bd1128eae3ba1af2eaa5dd41025d91
commit 311c0b9897bd1128eae3ba1af2eaa5dd41025d91
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 9 23:44:21 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 9 23:44:21 2014 +0100

    Eclipse: Skip generator expressions in COMPILE_DEFINITIONS (#14722)
    
    This is a hot-fix for the bug. It seems like a good idea to generally
    reform the generator to care about targets instead of directories,
    but this patch at least makes the reported error go away.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 33e76cd..74ba9a6 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -841,11 +841,16 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
       {
       // Expand the list.
       std::vector<std::string> defs;
-      cmSystemTools::ExpandListArgument(cdefs, defs);
+      cmGeneratorExpression::Split(cdefs, defs);
 
       for(std::vector<std::string>::const_iterator di = defs.begin();
           di != defs.end(); ++di)
         {
+        if (cmGeneratorExpression::Find(*di) != std::string::npos)
+          {
+          continue;
+          }
+
         std::string::size_type equals = di->find('=', 0);
         std::string::size_type enddef = di->length();
 

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

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake