[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-983-g9b7016e

[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  9b7016eea420f6eec2e016d2f694c58eea3e4bbd (commit)
       via  e9636dafb2e11b0df9da1841981514578e2659ca (commit)
      from  3cc9809f374ea224a24d145b85a3af8cffb4c2fd (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b7016eea420f6eec2e016d2f694c58eea3e4bbd
commit 9b7016eea420f6eec2e016d2f694c58eea3e4bbd
Merge: 3cc9809 e9636da
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 8 14:03:00 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 8 14:03:00 2016 -0500

    Merge topic 'imported-interface-libname' into next
    
    e9636daf fixup! Allow imported INTERFACE libraries to specify a link library name


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9636dafb2e11b0df9da1841981514578e2659ca
commit e9636dafb2e11b0df9da1841981514578e2659ca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 8 14:02:42 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 8 14:02:42 2016 -0500

    fixup! Allow imported INTERFACE libraries to specify a link library name

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index ff386f9..80e7e7d 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -610,7 +610,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       // Also add the item the interface specifies to be used in its place.
       std::string const& libName = tgt->GetImportedLibName(config);
       if (!libName.empty()) {
-        this->AddItem(libName, 0);
+        this->AddItem(libName, CM_NULLPTR);
       }
     } else {
       // Decide whether to use an import library.

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

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


hooks/post-receive
-- 
CMake