[Cmake-commits] CMake branch, next, updated. v3.2.1-1311-g1d136a8

[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  1d136a8197a3583b034f52ab2fb4e8caacb6ef29 (commit)
       via  0778016a0bba246e46f628aecd64e0f8afcc0fdb (commit)
      from  f3c457f81e18c4f3b9fa7ca66c1f255a508e381d (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=1d136a8197a3583b034f52ab2fb4e8caacb6ef29
commit 1d136a8197a3583b034f52ab2fb4e8caacb6ef29
Merge: f3c457f 0778016
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 11:24:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 31 11:24:08 2015 -0400

    Merge topic 'solaris-fix-target_link_libraries-test' into next
    
    0778016a Tests: Do not try to use invalid "ld -v" flag on Solaris


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0778016a0bba246e46f628aecd64e0f8afcc0fdb
commit 0778016a0bba246e46f628aecd64e0f8afcc0fdb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 11:20:20 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 31 11:21:36 2015 -0400

    Tests: Do not try to use invalid "ld -v" flag on Solaris
    
    Fix the CMakeCommands.target_link_libraries test to use "-V" instead of
    "-v" on Solaris because the latter does not exist.

diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/cmp0022/CMakeLists.txt
index 818b8c9..741c73e 100644
--- a/Tests/CMakeCommands/target_link_libraries/cmp0022/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/CMakeLists.txt
@@ -22,8 +22,18 @@ generate_export_header(staticlib1)
 add_library(staticlib2 STATIC staticlib2.cpp)
 generate_export_header(staticlib2)
 target_link_libraries(staticlib1 LINK_PUBLIC staticlib2)
+
+# Try adding a private link item to be propagated out of a static lib.
+set(private_link "")
 if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
-  target_link_libraries(staticlib1 LINK_PRIVATE "-Wl,-v")
+  if (CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+    set(private_link "-Wl,-V")
+  else()
+    set(private_link "-Wl,-v")
+  endif()
+endif()
+if(private_link)
+  target_link_libraries(staticlib1 LINK_PRIVATE "${private_link}")
 endif()
 
 add_executable(staticlib_exe staticlib_exe.cpp)

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

Summary of changes:
 .../target_link_libraries/cmp0022/CMakeLists.txt           |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake