[Cmake-commits] CMake branch, next, updated. v2.8.12.1-4892-ge590fdc

[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  e590fdc5e8048f3e74264648ff8699fd44908b8a (commit)
       via  53b10fdad70c31dc5eb3b187833b8bcb498210e2 (commit)
      from  a569509e7c870d38c91f5762e804f90e49445f37 (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=e590fdc5e8048f3e74264648ff8699fd44908b8a
commit e590fdc5e8048f3e74264648ff8699fd44908b8a
Merge: a569509 53b10fd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 6 17:04:01 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 6 17:04:01 2013 -0500

    Merge topic 'test-LINK_ONLY-expression' into next
    
    53b10fd Genex: Add a test for the LINK_ONLY expression.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53b10fdad70c31dc5eb3b187833b8bcb498210e2
commit 53b10fdad70c31dc5eb3b187833b8bcb498210e2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 6 22:57:31 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 6 22:57:31 2013 +0100

    Genex: Add a test for the LINK_ONLY expression.
    
    Commit 239b0c6b (Don't add invalid content to static lib
    INTERFACE_LINK_LIBRARIES., 2013-10-20) extended a test which
    excercised the logic of the LINK_ONLY generator expression.
    
    Commit ef10b87c (CMP0022: Plain target_link_libraries must populate
    link interface, 2013-11-02) removed the instance of LINK_ONLY which
    was excercised by that test.
    
    Add a new test which excercises the other instance of LINK_ONLY by
    setting the CMP0022 policy to NEW and consuming the contents of the
    INTERFACE_LINK_LIBRARIES target property.

diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW.cmake
similarity index 76%
copy from Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
copy to Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW.cmake
index ad3b8df..3fee15d 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW.cmake
@@ -1,5 +1,7 @@
 
-project(CMP0022-NOWARN-static)
+project(CMP0022-NOWARN-static-NEW)
+
+cmake_policy(SET CMP0022 NEW)
 
 add_library(foo STATIC empty_vs6_1.cpp)
 add_library(bar STATIC empty_vs6_2.cpp)
@@ -9,4 +11,4 @@ target_link_libraries(foo bar)
 # element which is not a valid target name. As bar is a STATIC library,
 # this tests that the LINK_ONLY generator expression is not used for
 # that element, creating an error.
-target_link_libraries(bar bat "-lz -lm")
+target_link_libraries(bar LINK_PRIVATE bat "-lz -lm")
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
index ad3b8df..3e4144f 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
@@ -5,8 +5,4 @@ add_library(foo STATIC empty_vs6_1.cpp)
 add_library(bar STATIC empty_vs6_2.cpp)
 add_library(bat STATIC empty_vs6_3.cpp)
 target_link_libraries(foo bar)
-# The last element here needs to contain a space so that it is a single
-# element which is not a valid target name. As bar is a STATIC library,
-# this tests that the LINK_ONLY generator expression is not used for
-# that element, creating an error.
-target_link_libraries(bar bat "-lz -lm")
+target_link_libraries(bar bat)
diff --git a/Tests/RunCMake/CMP0022/RunCMakeTest.cmake b/Tests/RunCMake/CMP0022/RunCMakeTest.cmake
index 2781d20..4c10996 100644
--- a/Tests/RunCMake/CMP0022/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMP0022/RunCMakeTest.cmake
@@ -7,6 +7,7 @@ run_cmake(CMP0022-WARN-empty-old)
 run_cmake(CMP0022-NOWARN-exe)
 run_cmake(CMP0022-NOWARN-shared)
 run_cmake(CMP0022-NOWARN-static)
+run_cmake(CMP0022-NOWARN-static-NEW)
 run_cmake(CMP0022-NOWARN-static-link_libraries)
 run_cmake(CMP0022-export)
 run_cmake(CMP0022-export-exe)

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

Summary of changes:
 ...rr.txt => CMP0022-NOWARN-static-NEW-stderr.txt} |    0
 ...tatic.cmake => CMP0022-NOWARN-static-NEW.cmake} |    6 ++++--
 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake |    6 +-----
 Tests/RunCMake/CMP0022/RunCMakeTest.cmake          |    1 +
 4 files changed, 6 insertions(+), 7 deletions(-)
 copy Tests/RunCMake/CMP0022/{CMP0022-NOWARN-exe-stderr.txt => CMP0022-NOWARN-static-NEW-stderr.txt} (100%)
 copy Tests/RunCMake/CMP0022/{CMP0022-NOWARN-static.cmake => CMP0022-NOWARN-static-NEW.cmake} (76%)


hooks/post-receive
-- 
CMake