[Cmake-commits] CMake branch, next, updated. v2.8.11.2-2985-g35df223

[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  35df223dffb36cf2b8c50c29115dc3329a1e5c33 (commit)
       via  cb2ce4a7798fb549c0673ac7b46a8c25204ca5e9 (commit)
      from  b0859bc89b3514d10d98d5c8f9e27bc6b002e9d5 (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=35df223dffb36cf2b8c50c29115dc3329a1e5c33
commit 35df223dffb36cf2b8c50c29115dc3329a1e5c33
Merge: b0859bc cb2ce4a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 9 10:03:01 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 9 10:03:01 2013 -0400

    Merge topic 'compile-defs-debugging' into next
    
    cb2ce4a Remove unused and broken code.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb2ce4a7798fb549c0673ac7b46a8c25204ca5e9
commit cb2ce4a7798fb549c0673ac7b46a8c25204ca5e9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 9 16:01:58 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 9 16:02:31 2013 +0200

    Remove unused and broken code.
    
    It somehow remained after a rebase conflict.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 96e2bb0..2972720 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3502,17 +3502,6 @@ void cmTarget::GetCompileDefinitions(std::vector<std::string> &list,
     }
   defsString += (configProp ? configProp : "");
 
-  {
-  cmGeneratorExpression ge(lfbt);
-  std::string result = ge.Parse(defsString.c_str())->Evaluate(this->Makefile,
-                                config,
-                                false,
-                                this,
-                                &dagChecker);
-
-  cmSystemTools::ExpandListArgument(result, list);
-  }
-
   std::string configString = config ? config : "";
   if (!this->Internal->CacheLinkInterfaceCompileDefinitionsDone[configString])
     {
@@ -3569,8 +3558,6 @@ void cmTarget::GetCompileDefinitions(std::vector<std::string> &list,
     this->Internal->CacheLinkInterfaceCompileDefinitionsDone[configString]
                                                                       = true;
     }
-
-  cmSystemTools::ExpandListArgument(result, list);
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmTarget.cxx |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake