[Cmake-commits] CMake branch, next, updated. v2.8.12-4330-g823cab5

[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  823cab54f05dec4a9cd24b13660c5b0341854b6e (commit)
       via  35bf7c0314eb734c53199576d617288386fd56f5 (commit)
      from  3f558657c93a71b03bef20f4b8c5fa8125d01b65 (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=823cab54f05dec4a9cd24b13660c5b0341854b6e
commit 823cab54f05dec4a9cd24b13660c5b0341854b6e
Merge: 3f55865 35bf7c0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 23 08:39:19 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 23 08:39:19 2013 -0400

    Merge topic 'fix-tll-static-private' into next
    
    35bf7c0 Add explanatory comment to the test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35bf7c0314eb734c53199576d617288386fd56f5
commit 35bf7c0314eb734c53199576d617288386fd56f5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 23 14:38:42 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 23 14:38:42 2013 +0200

    Add explanatory comment to the test.

diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
index 884db39..ad3b8df 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
@@ -5,4 +5,8 @@ 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")

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

Summary of changes:
 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake