[Cmake-commits] CMake branch, next, updated. v2.8.12-4067-g4cf2156

[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  4cf215666369e845d29d15ce31bc81ddee2b9d26 (commit)
       via  4fd60241c828cceb2dba5219dfdaa7b61268e700 (commit)
      from  66d49cfb10365c58d13b519f4f7bbe8d6f68fa25 (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=4cf215666369e845d29d15ce31bc81ddee2b9d26
commit 4cf215666369e845d29d15ce31bc81ddee2b9d26
Merge: 66d49cf 4fd6024
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 16 10:51:57 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 16 10:51:57 2013 -0400

    Merge topic 'print-CMP0022-content-conflict-test' into next
    
    4fd6024 CMP0022: Add unit test for null pointer check and message.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fd60241c828cceb2dba5219dfdaa7b61268e700
commit 4fd60241c828cceb2dba5219dfdaa7b61268e700
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 12 17:12:42 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 16 10:45:55 2013 -0400

    CMP0022: Add unit test for null pointer check and message.

diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old-result.txt b/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old-stderr.txt
new file mode 100644
index 0000000..6d519f0
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old-stderr.txt
@@ -0,0 +1,17 @@
+CMake Warning \(dev\) in CMakeLists.txt:
+  Policy CMP0022 is not set: INTERFACE_LINK_LIBRARIES defines the link
+  interface.  Run "cmake --help-policy CMP0022" for policy details.  Use the
+  cmake_policy command to set the policy and suppress this warning.
+
+  Target "bar" has a INTERFACE_LINK_LIBRARIES property which differs from its
+  LINK_INTERFACE_LIBRARIES properties.
+
+  INTERFACE_LINK_LIBRARIES:
+
+    foo
+
+  LINK_INTERFACE_LIBRARIES:
+
+    \(empty\)
+
+This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old.cmake b/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old.cmake
new file mode 100644
index 0000000..c5d3c29
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old.cmake
@@ -0,0 +1,10 @@
+
+project(CMP0022-WARN-empty-old)
+
+add_library(foo SHARED empty_vs6_1.cpp)
+add_library(bar SHARED empty_vs6_2.cpp)
+
+set_property(TARGET bar PROPERTY INTERFACE_LINK_LIBRARIES foo)
+
+add_library(user empty.cpp)
+target_link_libraries(user bar)
diff --git a/Tests/RunCMake/CMP0022/RunCMakeTest.cmake b/Tests/RunCMake/CMP0022/RunCMakeTest.cmake
index dcef0f5..8e5824a 100644
--- a/Tests/RunCMake/CMP0022/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMP0022/RunCMakeTest.cmake
@@ -3,6 +3,7 @@ include(RunCMake)
 run_cmake(CMP0022-WARN)
 run_cmake(CMP0022-WARN-tll)
 run_cmake(CMP0022-WARN-static)
+run_cmake(CMP0022-WARN-empty-old)
 run_cmake(CMP0022-NOWARN-static)
 run_cmake(CMP0022-NOWARN-static-link_libraries)
 run_cmake(CMP0022-export)

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

Summary of changes:


hooks/post-receive
-- 
CMake