[Cmake-commits] CMake branch, next, updated. v2.8.12-4099-g5401855

[Stephen Kelly]

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  5401855ba61d083ce584082de0eb3b62e614f02c (commit)
       via  dede273193139793d18e3e3fe800acec27140f06 (commit)
      from  2d5723224d64c4be99285c7ffc3afcda2893fba0 (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=5401855ba61d083ce584082de0eb3b62e614f02c
commit 5401855ba61d083ce584082de0eb3b62e614f02c
Merge: 2d57232 dede273
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 17 11:40:37 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 17 11:40:37 2013 -0400

    Merge topic 'allow-repeated-LINK-keywords' into next
    
    dede273 target_link_libraries: Allow repeated use of LINK_{PRIVATE,PUBLIC} keywords.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dede273193139793d18e3e3fe800acec27140f06
commit dede273193139793d18e3e3fe800acec27140f06
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 17 17:34:39 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 17 17:37:20 2013 +0200

    target_link_libraries: Allow repeated use of LINK_{PRIVATE,PUBLIC} keywords.
    
    This has not been allowed since they were introduced in
    commit 91438222 (target_link_libraries: Add LINK_(PUBLIC|PRIVATE)
    options, 2011-10-07), but allowing this form makes it more compatible
    with the newer PUBLIC and PRIVATE keywords.

diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 22f6a03..0707c62 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -151,7 +151,8 @@ bool cmTargetLinkLibrariesCommand
     else if(args[i] == "LINK_PUBLIC")
       {
       if(i != 1
-          && this->CurrentProcessingState != ProcessingPlainPrivateInterface)
+          && this->CurrentProcessingState != ProcessingPlainPrivateInterface
+          && this->CurrentProcessingState != ProcessingPlainPublicInterface)
         {
         this->Makefile->IssueMessage(
           cmake::FATAL_ERROR,
@@ -181,7 +182,8 @@ bool cmTargetLinkLibrariesCommand
     else if(args[i] == "LINK_PRIVATE")
       {
       if(i != 1
-          && this->CurrentProcessingState != ProcessingPlainPublicInterface)
+          && this->CurrentProcessingState != ProcessingPlainPublicInterface
+          && this->CurrentProcessingState != ProcessingPlainPrivateInterface)
         {
         this->Makefile->IssueMessage(
           cmake::FATAL_ERROR,
diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 06019e6..e11f980 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -32,7 +32,7 @@ generate_export_header(depA)
 add_library(depB SHARED depB.cpp)
 generate_export_header(depB)
 
-target_link_libraries(depB LINK_PRIVATE depA)
+target_link_libraries(depB LINK_PRIVATE depA LINK_PRIVATE depA)
 
 add_library(libgenex SHARED libgenex.cpp)
 generate_export_header(libgenex)
@@ -44,11 +44,11 @@ set_property(TARGET depB APPEND PROPERTY
 add_library(depC SHARED depC.cpp)
 generate_export_header(depC)
 
-target_link_libraries(depC LINK_PUBLIC depA)
+target_link_libraries(depC LINK_PUBLIC depA LINK_PUBLIC depA)
 
 assert_property(depA LINK_INTERFACE_LIBRARIES "")
 assert_property(depB LINK_INTERFACE_LIBRARIES "")
-assert_property(depC LINK_INTERFACE_LIBRARIES "depA")
+assert_property(depC LINK_INTERFACE_LIBRARIES "depA;depA")
 
 add_executable(targetA targetA.cpp)
 

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

Summary of changes:
 Source/cmTargetLinkLibrariesCommand.cxx            |    6 ++++--
 .../target_link_libraries/CMakeLists.txt           |    6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake