[Cmake-commits] CMake branch, next, updated. v2.8.9-525-g8b1b7d9

[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  8b1b7d960e36e5a61adca2b75750c09ab600b99f (commit)
       via  be2f788db09f39a0dfc3b215d24ad114e053abf6 (commit)
      from  686877c88db9593edc9466f38b68a839953401e2 (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=8b1b7d960e36e5a61adca2b75750c09ab600b99f
commit 8b1b7d960e36e5a61adca2b75750c09ab600b99f
Merge: 686877c be2f788
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 13 16:08:09 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 13 16:08:09 2012 -0400

    Merge topic 'generator-expression-refactor' into next
    
    be2f788 Disable false-positive warning from Borland.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be2f788db09f39a0dfc3b215d24ad114e053abf6
commit be2f788db09f39a0dfc3b215d24ad114e053abf6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 13 22:04:01 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 13 22:04:01 2012 +0200

    Disable false-positive warning from Borland.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 2755356..fce916c 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -170,6 +170,12 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
   }
 } configurationTestNode;
 
+#if defined(__BORLANDC__)
+# pragma warn -8008 /* condition is always true */
+// Borland gets confused about the template argument bools
+// used in if statements.
+#endif
+
 //----------------------------------------------------------------------------
 template<bool linker, bool soname, bool dirQual, bool nameQual>
 struct TargetFilesystemArtifact : public cmGeneratorExpressionNode

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

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


hooks/post-receive
-- 
CMake