[Cmake-commits] CMake branch, next, updated. v3.5.2-1397-g6a29f8c
Brad King
brad.king at kitware.com
Fri May 13 14:54:21 EDT 2016
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 6a29f8cc449469c646fb0a063cf5796c0f569bca (commit)
via 9cb263d77271598de6eccbf12052e1a7a7a059a4 (commit)
from 744f7717de3674bce41e59e9712db3fbff12b591 (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=6a29f8cc449469c646fb0a063cf5796c0f569bca
commit 6a29f8cc449469c646fb0a063cf5796c0f569bca
Merge: 744f771 9cb263d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 13 14:54:20 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 13 14:54:20 2016 -0400
Merge topic 'link-item-interface-not-path' into next
9cb263d7 cmComputeLinkInformation: Do not mark interface library as a path
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cb263d77271598de6eccbf12052e1a7a7a059a4
commit 9cb263d77271598de6eccbf12052e1a7a7a059a4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 13 13:54:08 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 13 14:39:53 2016 -0400
cmComputeLinkInformation: Do not mark interface library as a path
The empty string we add as a link item for an INTERFACE_LIBRARY target
is not a path, so do not mark it as such. The generators currently
tolerate it either way, but only by accident.
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 0aa6a99..5b42b1a 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -655,7 +655,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
// Add the interface library as an item so it can be considered as part
// of COMPATIBLE_INTERFACE_ enforcement. The generators will ignore
// this for the actual link line.
- this->Items.push_back(Item(std::string(), true, tgt));
+ this->Items.push_back(Item(std::string(), false, tgt));
}
else
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmComputeLinkInformation.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list