[Cmake-commits] CMake branch, next, updated. v2.8.12-4765-g499125d

[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  499125db4326ce635307bbde63d0c699b0360db2 (commit)
       via  4064d6f216ff6090d2da5797059df13924cc3589 (commit)
      from  3c01fbc10bbff4582cf102d159a32c32ed43c8de (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=499125db4326ce635307bbde63d0c699b0360db2
commit 499125db4326ce635307bbde63d0c699b0360db2
Merge: 3c01fbc 4064d6f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 2 07:12:33 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 2 07:12:33 2013 -0400

    Merge topic 'revert-accidental-tll-change' into next
    
    4064d6f target_link_libraries: Revert accidental change


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4064d6f216ff6090d2da5797059df13924cc3589
commit 4064d6f216ff6090d2da5797059df13924cc3589
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 2 07:07:53 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 2 07:11:51 2013 -0400

    target_link_libraries: Revert accidental change
    
    In commit c4373b33 (cmTarget: Make GetProperty() const, 2013-10-29)
    we accidentally changed the cmTargetLinkLibrariesCommand.cxx logic
    in a way that looks like a local experiment leftover that went
    unnoticed due to the size of the other changes in the commit.
    Revert it.

diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 6b6fe4c..9add198 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -384,13 +384,8 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const char* lib,
         }
     }
 
-  if(this->CurrentProcessingState == ProcessingLinkLibraries
-        && !this->Target->GetProperty("LINK_INTERFACE_LIBRARIES"))
-    {
-    this->Makefile
-      ->AddLinkLibraryForTarget(this->Target->GetName(), lib, llt);
-    }
-  else if(this->CurrentProcessingState != ProcessingKeywordLinkInterface
+  // Handle normal case first.
+  if(this->CurrentProcessingState != ProcessingKeywordLinkInterface
       && this->CurrentProcessingState != ProcessingPlainLinkInterface)
     {
     this->Makefile

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

Summary of changes:
 Source/cmTargetLinkLibrariesCommand.cxx |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake