[Cmake-commits] CMake branch, next, updated. v3.6.2-2166-gfe89762

[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  fe8976265416da8333cd7497d8d41db177b23769 (commit)
       via  18d4ce24bba376cddd0f0430de906814535b9069 (commit)
      from  cade5c78ff25278826bc1690084230a04994a6e6 (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=fe8976265416da8333cd7497d8d41db177b23769
commit fe8976265416da8333cd7497d8d41db177b23769
Merge: cade5c7 18d4ce2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 17 04:55:12 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 17 04:55:12 2016 -0400

    Merge topic 'predictable-add_custom_command-output' into next
    
    18d4ce24 Make the add_custom_command output more predictable


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18d4ce24bba376cddd0f0430de906814535b9069
commit 18d4ce24bba376cddd0f0430de906814535b9069
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 8 01:20:35 2016 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 17 10:22:24 2016 +0200

    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..b643b57 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:
 Source/cmAddCustomCommandCommand.cxx                         |    4 ++--
 Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake