[Cmake-commits] CMake branch, next, updated. v3.0.0-4318-g77066b4
Ben Boeckel
ben.boeckel at kitware.com
Wed Jul 16 17:32:56 EDT 2014
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 77066b46b623d4adca35cdbb196dcec4472c54ab (commit)
via dccda39c29010f18b4f4d6f1d1b49552073e767e (commit)
from c77871bb8b938d98420f4e7cd833cc38b58fd748 (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=77066b46b623d4adca35cdbb196dcec4472c54ab
commit 77066b46b623d4adca35cdbb196dcec4472c54ab
Merge: c77871b dccda39
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jul 16 17:32:55 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 16 17:32:55 2014 -0400
Merge topic 'dev/target-fastpaths' into next
dccda39c fixup! cmTarget: Use static strings for special property names
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dccda39c29010f18b4f4d6f1d1b49552073e767e
commit dccda39c29010f18b4f4d6f1d1b49552073e767e
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jul 16 17:32:48 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Jul 16 17:32:48 2014 -0400
fixup! cmTarget: Use static strings for special property names
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 47ca8dd..393c447 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6197,7 +6197,6 @@ cmTargetInternals::ComputeLinkInterfaceLibraries(
// Compare the link implementation fallback link interface to the
// preferred new link interface property and warn if different.
std::vector<cmLinkItem> ifaceLibs;
- if(const char* newExplicitLibraries = this->GetProperty(newProp))
if(const char* newExplicitLibraries = thisTarget->GetProperty(newProp))
{
thisTarget->ExpandLinkItems(newProp, newExplicitLibraries, config,
-----------------------------------------------------------------------
Summary of changes:
Source/cmTarget.cxx | 1 -
1 file changed, 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list