[Cmake-commits] CMake branch, next, updated. v3.2.2-3217-gaec6c3a

[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  aec6c3aa35d918214f2ab520c1cba3bca9067f27 (commit)
       via  9fbc01e6bf14bad5f8e1140741275dcd9b5c8aef (commit)
      from  11716a5999b1fc2204102e9116e5d13b9c47e8fd (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=aec6c3aa35d918214f2ab520c1cba3bca9067f27
commit aec6c3aa35d918214f2ab520c1cba3bca9067f27
Merge: 11716a5 9fbc01e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 27 14:43:47 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 27 14:43:47 2015 -0400

    Merge topic 'imported-interface-libname' into next
    
    9fbc01e6 Tests: Try LSB linker workaround in InterfaceLibrary test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fbc01e6bf14bad5f8e1140741275dcd9b5c8aef
commit 9fbc01e6bf14bad5f8e1140741275dcd9b5c8aef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 27 14:38:37 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 27 14:38:54 2015 -0400

    Tests: Try LSB linker workaround in InterfaceLibrary test
    
    Use "-litem_real -litem_fake" instead of "-litem_real libitem_fake.a"
    so the LSB compiler wrapper treats both items the same way.

diff --git a/Tests/InterfaceLibrary/CMakeLists.txt b/Tests/InterfaceLibrary/CMakeLists.txt
index 92eec3f..a4dd021 100644
--- a/Tests/InterfaceLibrary/CMakeLists.txt
+++ b/Tests/InterfaceLibrary/CMakeLists.txt
@@ -27,7 +27,8 @@ target_sources(iface_objlib INTERFACE $<TARGET_OBJECTS:objlib>)
 add_library(intermediate INTERFACE)
 target_link_libraries(intermediate INTERFACE iface_objlib)
 
-add_library(item_fake STATIC item_fake.cpp)
+add_library(item_fake_tgt STATIC item_fake.cpp)
+set_property(TARGET item_fake_tgt PROPERTY OUTPUT_NAME item_fake)
 add_library(item_real STATIC item.cpp)
 add_library(item_iface INTERFACE IMPORTED)
 set_property(TARGET item_iface PROPERTY IMPORTED_LIBNAME item_real)

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

Summary of changes:
 Tests/InterfaceLibrary/CMakeLists.txt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake