[Cmake-commits] CMake branch, next, updated. v3.6.2-2186-gca997ba

[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  ca997ba3cbda973ab509f7e66df97e00204ca825 (commit)
       via  92d76b50aa50df14491685f049b7ba109f0d8697 (commit)
      from  8b59ace9aca2a629c9b4acbdae648ed0db2379b0 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca997ba3cbda973ab509f7e66df97e00204ca825
commit ca997ba3cbda973ab509f7e66df97e00204ca825
Merge: 8b59ace 92d76b5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 19 08:50:00 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 19 08:50:00 2016 -0400

    Merge topic 'predictable-add_custom_command-output' into next
    
    92d76b50 Make the add_custom_command output more predictable


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92d76b50aa50df14491685f049b7ba109f0d8697
commit 92d76b50aa50df14491685f049b7ba109f0d8697
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 8 01:20:35 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 19 08:49:46 2016 -0400

    Make the add_custom_command output more predictable
    
    I otherwise get:
    
       Expected stderr to match:
    
        expect-err> CMake Error at AppendNotOutput.cmake:1 \(add_custom_command\):
        expect-err>   add_custom_command given APPEND option with output.*
        expect-err>   which is not already a custom command output.
        expect-err> Call Stack \(most recent call first\):
        expect-err>   CMakeLists.txt:3 \(include\)
    
       Actual stderr:
    
        actual-err> CMake Error at AppendNotOutput.cmake:1 (add_custom_command):
        actual-err>   add_custom_command given APPEND option with output
        actual-err>   "/home/stephen/dev/src/cmake/with
        actual-err> space/Tests/RunCMake/add_custom_command/AppendNotOutput-build/out" which is
        actual-err>   not already a custom command output.
        actual-err> Call Stack (most recent call first):
        actual-err>   CMakeLists.txt:3 (include)
    
    Using a specific line for paths is a style already used elsewhere for
    the same reason, such as CMP0041 output.

diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx
index 2c4a4ca..2e28498 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -263,8 +263,8 @@ bool cmAddCustomCommandCommand::InitialPass(
 
     // No command for this output exists.
     std::ostringstream e;
-    e << "given APPEND option with output \"" << output[0]
-      << "\" which is not already a custom command output.";
+    e << "given APPEND option with output\n\"" << output[0]
+      << "\"\nwhich is not already a custom command output.";
     this->SetError(e.str());
     return false;
   }
diff --git a/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt b/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
index 96d0972..cd542d8 100644
--- a/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
+++ b/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
@@ -1,5 +1,8 @@
 CMake Error at AppendNotOutput.cmake:1 \(add_custom_command\):
-  add_custom_command given APPEND option with output.*
+  add_custom_command given APPEND option with output
+
+  .*RunCMake/add_custom_command/AppendNotOutput-build/out.*
+
   which is not already a custom command output.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)

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

Summary of changes:


hooks/post-receive
-- 
CMake