[Cmake-commits] CMake branch, next, updated. v2.8.12-4815-g82b717a

[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  82b717a83bdfdf274091111dee36bc6a493287ed (commit)
       via  b51696f003a945e7f9de0b551afd707416cc09fa (commit)
       via  25b7f87ecadb400db0d206e938ec1d2771d735a7 (commit)
      from  357b100061179e176e04fa7206dbaafc9f3c9c71 (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=82b717a83bdfdf274091111dee36bc6a493287ed
commit 82b717a83bdfdf274091111dee36bc6a493287ed
Merge: 357b100 b51696f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Nov 3 10:22:25 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 3 10:22:25 2013 -0500

    Merge topic 'policy-CMP0022-fixes-for-master' into next
    
    b51696f CMP0022: Update target_link_libraries plain signature documentation
    25b7f87 Merge branch 'policy-CMP0022-fixes' into policy-CMP0022-fixes-for-master


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b51696f003a945e7f9de0b551afd707416cc09fa
commit b51696f003a945e7f9de0b551afd707416cc09fa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Nov 3 09:23:02 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Nov 3 09:23:02 2013 -0500

    CMP0022: Update target_link_libraries plain signature documentation
    
    Make the documentation change made by commit ef10b87c (CMP0022: Plain
    target_link_libraries must populate link interface, 2013-11-02) in the
    new location for the same documentation.

diff --git a/Help/command/target_link_libraries.rst b/Help/command/target_link_libraries.rst
index 41265fd..c2d2dc6 100644
--- a/Help/command/target_link_libraries.rst
+++ b/Help/command/target_link_libraries.rst
@@ -32,13 +32,16 @@ per-configuration rules by creating and linking to IMPORTED library
 targets.  See the IMPORTED mode of the add_library command for more
 information.
 
-Library dependencies are transitive by default.  When this target is
-linked into another target then the libraries linked to this target
-will appear on the link line for the other target too.  See the
-INTERFACE_LINK_LIBRARIES target property to override the set of
-transitive link dependencies for a target.  Calls to other signatures
-of this command may set the property making any libraries linked
-exclusively by this signature private.
+Library dependencies are transitive by default with this signature.
+When this target is linked into another target then the libraries
+linked to this target will appear on the link line for the other
+target too.  This transitive "link interface" is stored in the
+INTERFACE_LINK_LIBRARIES target property when policy CMP0022 is set to
+NEW and may be overridden by setting the property directly.
+(When CMP0022 is not set to NEW, transitive linking is builtin but may
+be overridden by the LINK_INTERFACE_LIBRARIES property.  Calls to other
+signatures of this command may set the property making any libraries
+linked exclusively by this signature private.)
 
 CMake will also propagate "usage requirements" from linked library
 targets.  Usage requirements affect compilation of sources in the

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25b7f87ecadb400db0d206e938ec1d2771d735a7
commit 25b7f87ecadb400db0d206e938ec1d2771d735a7
Merge: 6f6caee 0a561a0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Nov 3 09:20:47 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Nov 3 09:20:47 2013 -0500

    Merge branch 'policy-CMP0022-fixes' into policy-CMP0022-fixes-for-master
    
    Resolve conflict in Source/cmTarget.cxx by integrating the changes to
    the internal copy constructor from both sides.  Also resolve a logical
    conflict by dropping the special case for INTERFACE_LIBRARY targets.
    Since cmTarget::SetMakefile already forces CMP0022 to NEW for such
    targets we need no special handling.
    
    Resolve conflict in Source/cmTargetLinkLibrariesCommand.h by dropping
    the documentation change.  We will make the same change in the new
    location of the same documentation in a separate commit.
    
    Resolve conflicts in
    
     Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old-stderr.txt
     Tests/RunCMake/CMP0022/RunCMakeTest.cmake
    
    by taking the side from the 'policy-CMP0022-fixes' branch.

diff --cc Source/cmTarget.cxx
index 70ab947,3598fcc..7e87514
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -81,11 -83,16 +81,13 @@@ class cmTargetInternal
  public:
    cmTargetInternals()
      {
+     this->PolicyWarnedCMP0022 = false;
      this->SourceFileFlagsConstructed = false;
      }
 -  cmTargetInternals(cmTargetInternals const& r)
 +  cmTargetInternals(cmTargetInternals const&)
      {
+     this->PolicyWarnedCMP0022 = false;
      this->SourceFileFlagsConstructed = false;
 -    // Only some of these entries are part of the object state.
 -    // Others not copied here are result caches.
 -    this->SourceEntries = r.SourceEntries;
      }
    ~cmTargetInternals();
    typedef cmTarget::SourceFileFlags SourceFileFlags;

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

Summary of changes:


hooks/post-receive
-- 
CMake