[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7220-g1bf9ba2

[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  1bf9ba29b69544f5f56f938729db044001105e90 (commit)
       via  de9c09c83d1a8c6236db36465f02e1a5276ee980 (commit)
      from  99bc37a2281153a4e570e758adb202a7a4ee3b03 (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=1bf9ba29b69544f5f56f938729db044001105e90
commit 1bf9ba29b69544f5f56f938729db044001105e90
Merge: 99bc37a de9c09c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 22 08:46:37 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 22 08:46:37 2014 -0500

    Merge topic 'qcc-id' into next
    
    de9c09c8 QNX: Fix typo in CMP0047 implementation comment


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de9c09c83d1a8c6236db36465f02e1a5276ee980
commit de9c09c83d1a8c6236db36465f02e1a5276ee980
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 22 08:46:14 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 22 08:46:14 2014 -0500

    QNX: Fix typo in CMP0047 implementation comment

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 583b150..03486d8 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -800,7 +800,7 @@ void cmGlobalGenerator::CheckCompilerIdCompatibility(cmMakefile* mf,
           mf->IssueMessage(cmake::AUTHOR_WARNING, w.str());
           }
       case cmPolicies::OLD:
-        // OLD behavior is to convert AppleClang to Clang.
+        // OLD behavior is to convert QCC to GNU.
         mf->AddDefinition(compilerIdVar.c_str(), "GNU");
         break;
       case cmPolicies::REQUIRED_IF_USED:

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake