[Cmake-commits] CMake branch, next, updated. v2.8.6-2018-g0799223

[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  07992233965dc71ab03bfccc79179176996454b3 (commit)
       via  b1f12f8042ef0d7b190c04644905d3b3a325d4ae (commit)
       via  5fc95dff464b08c83df2c904a281bb4c45278a35 (commit)
      from  99966be1f7e2497bfca909db9232e64351687865 (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=07992233965dc71ab03bfccc79179176996454b3
commit 07992233965dc71ab03bfccc79179176996454b3
Merge: 99966be b1f12f8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 22 17:26:35 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 22 17:26:35 2011 -0500

    Merge topic 'target-link-libraries-interfaces' into next
    
    b1f12f8 target_link_libraries: Simplify argument processing state tests
    5fc95df target_link_libraries: Add missing space in documentation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1f12f8042ef0d7b190c04644905d3b3a325d4ae
commit b1f12f8042ef0d7b190c04644905d3b3a325d4ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 22 17:20:23 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 22 17:21:36 2011 -0500

    target_link_libraries: Simplify argument processing state tests
    
    Remove extra parens in test for not handling LINK_INTERFACE_LIBRARIES.
    Remove redundant test for equality with ProcessingPrivateInterface
    subsumed by test for inequality with ProcessingPublicInterface.

diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 0db5943..36c4ca8 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -217,8 +217,8 @@ bool cmTargetLinkLibrariesCommand
   // Use of any of the new keywords implies awareness of
   // this property. And if no libraries are named, it should
   // result in an empty link interface.
-  if((this->CurrentProcessingState != ProcessingLinkLibraries)
-    && !this->Target->GetProperty("LINK_INTERFACE_LIBRARIES"))
+  if(this->CurrentProcessingState != ProcessingLinkLibraries &&
+     !this->Target->GetProperty("LINK_INTERFACE_LIBRARIES"))
     {
     this->Target->SetProperty("LINK_INTERFACE_LIBRARIES", "");
     }
@@ -249,9 +249,9 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const char* lib,
     {
     this->Makefile
       ->AddLinkLibraryForTarget(this->Target->GetName(), lib, llt);
-    if (this->CurrentProcessingState != ProcessingPublicInterface
-        || this->CurrentProcessingState == ProcessingPrivateInterface)
+    if (this->CurrentProcessingState != ProcessingPublicInterface)
       {
+      // Not LINK_INTERFACE_LIBRARIES or LINK_PUBLIC, do not add to interface.
       return;
       }
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fc95dff464b08c83df2c904a281bb4c45278a35
commit 5fc95dff464b08c83df2c904a281bb4c45278a35
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 22 17:19:04 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 22 17:19:04 2011 -0500

    target_link_libraries: Add missing space in documentation
    
    Change "thelink" to "the link".

diff --git a/Source/cmTargetLinkLibrariesCommand.h b/Source/cmTargetLinkLibrariesCommand.h
index e91c46d..8df4ac0 100644
--- a/Source/cmTargetLinkLibrariesCommand.h
+++ b/Source/cmTargetLinkLibrariesCommand.h
@@ -112,8 +112,8 @@ public:
       "                          [[debug|optimized|general] <lib>] ...\n"
       "                        [<LINK_PRIVATE|LINK_PUBLIC>\n"
       "                          [[debug|optimized|general] <lib>] ...])\n"
-      "The LINK_PUBLIC and LINK_PRIVATE modes can be used to specify both the"
-      "link dependencies and the link interface in one command.  "
+      "The LINK_PUBLIC and LINK_PRIVATE modes can be used to specify both "
+      "the link dependencies and the link interface in one command.  "
       "Libraries and targets following LINK_PUBLIC are linked to, and are "
       "made part of the LINK_INTERFACE_LIBRARIES. Libraries and targets "
       "following LINK_PRIVATE are linked to, but are not made part of the "

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

Summary of changes:
 Source/cmTargetLinkLibrariesCommand.cxx |    8 ++++----
 Source/cmTargetLinkLibrariesCommand.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake