[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3603-gc04390e

[Brad King]

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  c04390e2cb68634999cb3af24f39775b8b87774e (commit)
       via  86be733fa589fc1755db9274a5606f71062a6c0f (commit)
      from  e7bed3120557eec736cd4c1df2e413d7003c9f3a (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=c04390e2cb68634999cb3af24f39775b8b87774e
commit c04390e2cb68634999cb3af24f39775b8b87774e
Merge: e7bed31 86be733
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 6 09:51:59 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 6 09:51:59 2014 -0400

    Merge topic 'dev/backtrace-performance' into next
    
    86be733f cmGeneratorExpression: Add workaround for Borland compiler


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86be733fa589fc1755db9274a5606f71062a6c0f
commit 86be733fa589fc1755db9274a5606f71062a6c0f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 6 09:51:33 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 6 09:51:33 2014 -0400

    cmGeneratorExpression: Add workaround for Borland compiler

diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index dea57e0..028d229 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -33,10 +33,18 @@ cmGeneratorExpression::cmGeneratorExpression(
 cmsys::auto_ptr<cmCompiledGeneratorExpression>
 cmGeneratorExpression::Parse(std::string const& input)
 {
+#if !defined(__BORLANDC__)
   return cmsys::auto_ptr<cmCompiledGeneratorExpression>(
     new cmCompiledGeneratorExpression(
       this->Backtrace ? *this->Backtrace : cmListFileBacktrace(NULL),
       input));
+#else
+  cmListFileBacktrace emptyBacktrace(NULL);
+  return cmsys::auto_ptr<cmCompiledGeneratorExpression>(
+    new cmCompiledGeneratorExpression(
+      this->Backtrace ? *this->Backtrace : emptyBacktrace,
+      input));
+#endif
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmGeneratorExpression.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake