[Cmake-commits] CMake branch, next, updated. v3.2.2-3179-g2249925

[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  2249925931f659b47cb97824e6b315aa5e432310 (commit)
       via  b300820b11e3a084bbc85989c29a98b183d00238 (commit)
      from  154f87549bf8d68211f0f8b3b98c3fddfbe373c5 (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=2249925931f659b47cb97824e6b315aa5e432310
commit 2249925931f659b47cb97824e6b315aa5e432310
Merge: 154f875 b300820
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 14:06:21 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 26 14:06:21 2015 -0400

    Merge topic 'imported-link-item' into next
    
    b300820b fixup! Allow imported INTERFACE libraries to specify a link item


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b300820b11e3a084bbc85989c29a98b183d00238
commit b300820b11e3a084bbc85989c29a98b183d00238
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 14:05:58 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 26 14:05:58 2015 -0400

    fixup! Allow imported INTERFACE libraries to specify a link item

diff --git a/Tests/RunCMake/interface_library/IMPORTED_LINK_ITEM-non-iface-stderr.txt b/Tests/RunCMake/interface_library/IMPORTED_LINK_ITEM-non-iface-stderr.txt
index 4d64a83..1576f72 100644
--- a/Tests/RunCMake/interface_library/IMPORTED_LINK_ITEM-non-iface-stderr.txt
+++ b/Tests/RunCMake/interface_library/IMPORTED_LINK_ITEM-non-iface-stderr.txt
@@ -18,4 +18,28 @@ Call Stack \(most recent call first\):
 CMake Error at IMPORTED_LINK_ITEM-non-iface.cmake:[0-9]+ \(set_property\):
   IMPORTED_LINK_ITEM_DEBUG property may not be APPENDed.
 Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LINK_ITEM-non-iface.cmake:[0-9]+ \(set_property\):
+  IMPORTED_LINK_ITEM property may be set only on imported INTERFACE library
+  targets.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LINK_ITEM-non-iface.cmake:[0-9]+ \(set_property\):
+  IMPORTED_LINK_ITEM property may be set only on imported INTERFACE library
+  targets.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LINK_ITEM-non-iface.cmake:[0-9]+ \(set_property\):
+  IMPORTED_LINK_ITEM property may be set only on imported INTERFACE library
+  targets.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LINK_ITEM-non-iface.cmake:[0-9]+ \(set_property\):
+  IMPORTED_LINK_ITEM property may be set only on imported INTERFACE library
+  targets.
+Call Stack \(most recent call first\):
   CMakeLists.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/interface_library/IMPORTED_LINK_ITEM-non-iface.cmake b/Tests/RunCMake/interface_library/IMPORTED_LINK_ITEM-non-iface.cmake
index db93324..1f5092e 100644
--- a/Tests/RunCMake/interface_library/IMPORTED_LINK_ITEM-non-iface.cmake
+++ b/Tests/RunCMake/interface_library/IMPORTED_LINK_ITEM-non-iface.cmake
@@ -1,5 +1,17 @@
-add_custom_target(MyTarget)
-set_property(TARGET MyTarget PROPERTY IMPORTED_LINK_ITEM item1)
-set_property(TARGET MyTarget APPEND PROPERTY IMPORTED_LINK_ITEM item2)
-set_property(TARGET MyTarget PROPERTY IMPORTED_LINK_ITEM_DEBUG item1)
-set_property(TARGET MyTarget APPEND PROPERTY IMPORTED_LINK_ITEM_DEBUG item2)
+add_custom_target(MyCustom)
+set_property(TARGET MyCustom PROPERTY IMPORTED_LINK_ITEM item1)
+set_property(TARGET MyCustom APPEND PROPERTY IMPORTED_LINK_ITEM item2)
+set_property(TARGET MyCustom PROPERTY IMPORTED_LINK_ITEM_DEBUG item1)
+set_property(TARGET MyCustom APPEND PROPERTY IMPORTED_LINK_ITEM_DEBUG item2)
+
+add_library(MyStatic STATIC IMPORTED)
+set_property(TARGET MyStatic PROPERTY IMPORTED_LINK_ITEM item1)
+
+add_library(MyShared SHARED IMPORTED)
+set_property(TARGET MyShared PROPERTY IMPORTED_LINK_ITEM item1)
+
+add_library(MyModule MODULE IMPORTED)
+set_property(TARGET MyModule PROPERTY IMPORTED_LINK_ITEM item1)
+
+add_executable(MyExe IMPORTED)
+set_property(TARGET MyExe PROPERTY IMPORTED_LINK_ITEM item1)

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

Summary of changes:
 .../IMPORTED_LINK_ITEM-non-iface-stderr.txt        |   24 ++++++++++++++++++++
 .../IMPORTED_LINK_ITEM-non-iface.cmake             |   22 ++++++++++++++----
 2 files changed, 41 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake