[Cmake-commits] CMake branch, next, updated. v3.0.0-4320-gf1e74a6

[Ben Boeckel]

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  f1e74a6f0351650fd7108f34e8f63bb8f1e4ab6d (commit)
       via  086201fcca622e97d6925523671a99efadf4c885 (commit)
      from  77066b46b623d4adca35cdbb196dcec4472c54ab (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=f1e74a6f0351650fd7108f34e8f63bb8f1e4ab6d
commit f1e74a6f0351650fd7108f34e8f63bb8f1e4ab6d
Merge: 77066b4 086201f
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jul 16 17:35:24 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 16 17:35:24 2014 -0400

    Merge topic 'dev/target-fastpaths' into next
    
    086201fc fixup! cmTarget: Use static strings for special property names


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=086201fcca622e97d6925523671a99efadf4c885
commit 086201fcca622e97d6925523671a99efadf4c885
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jul 16 17:35:17 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Jul 16 17:35:17 2014 -0400

    fixup! cmTarget: Use static strings for special property names

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 393c447..a203a7f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6197,6 +6197,7 @@ cmTargetInternals::ComputeLinkInterfaceLibraries(
       // Compare the link implementation fallback link interface to the
       // preferred new link interface property and warn if different.
       std::vector<cmLinkItem> ifaceLibs;
+      static const std::string newProp = "INTERFACE_LINK_LIBRARIES";
       if(const char* newExplicitLibraries = thisTarget->GetProperty(newProp))
         {
         thisTarget->ExpandLinkItems(newProp, newExplicitLibraries, config,

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

Summary of changes:
 Source/cmTarget.cxx |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake