[Cmake-commits] CMake branch, next, updated. v3.2.0-911-g248c2a8

[Nils Gladitz]

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  248c2a8d0bd7eb82ea9bb924fd3e930eb4113ef0 (commit)
       via  1f615523e9bc05b1f791da47fc81cd585be3c595 (commit)
      from  fa7fb614ecd53a88893e5d9c9ed6377531d101e9 (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=248c2a8d0bd7eb82ea9bb924fd3e930eb4113ef0
commit 248c2a8d0bd7eb82ea9bb924fd3e930eb4113ef0
Merge: fa7fb61 1f61552
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Mar 9 07:45:26 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 9 07:45:26 2015 -0400

    Merge topic 'main_dependency_diagnostic' into next
    
    1f615523 add_custom_command: Fix CMP0057 test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f615523e9bc05b1f791da47fc81cd585be3c595
commit 1f615523e9bc05b1f791da47fc81cd585be3c595
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Mar 9 12:45:04 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Mar 9 12:45:04 2015 +0100

    add_custom_command: Fix CMP0057 test.

diff --git a/Tests/RunCMake/CMP0057/CMP0057-WARN-stderr.txt b/Tests/RunCMake/CMP0057/CMP0057-WARN-stderr.txt
index 0791bcc..da3a1cb 100644
--- a/Tests/RunCMake/CMP0057/CMP0057-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0057/CMP0057-WARN-stderr.txt
@@ -1,8 +1,7 @@
 CMake Warning \(dev\) at CMP0057-WARN.cmake:6 \(add_custom_command\):
   Policy CMP0057 is not set: Disallow multiple MAIN_DEPENDENCY specifications
-  for the same input file.  Run "cmake --help-policy CMP0057" for policy
-  details.  Use the cmake_policy command to set the policy and suppress this
-  warning.
+  for the same file.  Run "cmake --help-policy CMP0057" for policy details.
+  Use the cmake_policy command to set the policy and suppress this warning.
 
   "input.txt" can only be specified as a custom command MAIN_DEPENDENCY once.
 Call Stack \(most recent call first\):

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

Summary of changes:
 Tests/RunCMake/CMP0057/CMP0057-WARN-stderr.txt |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake