[Cmake-commits] CMake branch, next, updated. v2.8.9-674-g33f6e9f

[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  33f6e9fa0017b5c80b57ff7e86c31e96f508b91f (commit)
       via  173746b631a3568fc18b573a8840345d5774c01f (commit)
      from  30dcd76a972fdd6324a825ea7f3610ce08aec4a0 (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=33f6e9fa0017b5c80b57ff7e86c31e96f508b91f
commit 33f6e9fa0017b5c80b57ff7e86c31e96f508b91f
Merge: 30dcd76 173746b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 21 07:54:01 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 21 07:54:01 2012 -0400

    Merge topic 'generator-expression-target-properties' into next
    
    173746b Use alternative mvp workaround.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=173746b631a3568fc18b573a8840345d5774c01f
commit 173746b631a3568fc18b573a8840345d5774c01f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 21 13:52:30 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Sep 21 13:52:30 2012 +0200

    Use alternative mvp workaround.
    
    bcc apparently doesn't like the extra parentheses.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 67cd721..81ca603 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -297,7 +297,8 @@ std::vector<std::string> cmGeneratorTarget::GetIncludeDirectories()
     }
 
   const char *config = this->Makefile->GetDefinition("CMAKE_BUILD_TYPE");
-  cmGeneratorExpression ge((cmListFileBacktrace()));
+  cmListFileBacktrace lfbt;
+  cmGeneratorExpression ge(lfbt);
 
   cmGeneratorExpressionDAGChecker dagChecker(cmListFileBacktrace(),
                                               this->GetName(),
@@ -346,7 +347,8 @@ std::string cmGeneratorTarget::GetCompileDefinitions(const char *config)
     return "";
     }
 
-  cmGeneratorExpression ge((cmListFileBacktrace()));
+  cmListFileBacktrace lfbt;
+  cmGeneratorExpression ge(lfbt);
 
   cmGeneratorExpressionDAGChecker dagChecker(cmListFileBacktrace(),
                                              this->GetName(),

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

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


hooks/post-receive
-- 
CMake