[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4161-g56d48e7

[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  56d48e74c1d796c839595ff30da99e5c86b0689d (commit)
       via  271bf10263893e0ec2e0c9d20d2c0220262998ec (commit)
      from  e89af89a443d381d5175d780f5d14faf12921e11 (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=56d48e74c1d796c839595ff30da99e5c86b0689d
commit 56d48e74c1d796c839595ff30da99e5c86b0689d
Merge: e89af89 271bf10
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 13 11:37:46 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 13 11:37:46 2013 -0400

    Merge topic 'print-CMP0022-content-conflict' into next
    
    271bf10 Fix CMP0022 warning when no old-style property is set


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=271bf10263893e0ec2e0c9d20d2c0220262998ec
commit 271bf10263893e0ec2e0c9d20d2c0220262998ec
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 12 17:12:42 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 13 11:34:08 2013 -0400

    Fix CMP0022 warning when no old-style property is set
    
    The string could be null at this point.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ce0d0f2..ac655da 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6449,7 +6449,7 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
             << newExplicitLibraries
             << "\n"
             << linkIfaceProp << ":\n  "
-            << explicitLibraries << "\n";
+            << (explicitLibraries ? explicitLibraries : "(empty)") << "\n";
           this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str());
           }
           // Fall through

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

Summary of changes:


hooks/post-receive
-- 
CMake