diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-19 12:55:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-19 12:55:24 (GMT) |
| commit | ec5114f997a7a8cde5b734823eefa97d5c37ff69 (patch) | |
| tree | 5e83fb2cf312c3947c6c6509dd627ed00f5a2c6b | |
| parent | 995d6be1282cb1f7c92bb136be10163a704e7d10 (diff) | |
| parent | 92d76b50aa50df14491685f049b7ba109f0d8697 (diff) | |
| download | CMake-ec5114f997a7a8cde5b734823eefa97d5c37ff69.zip CMake-ec5114f997a7a8cde5b734823eefa97d5c37ff69.tar.gz CMake-ec5114f997a7a8cde5b734823eefa97d5c37ff69.tar.bz2 | |
Merge topic 'predictable-add_custom_command-output'
92d76b50 Make the add_custom_command output more predictable
| -rw-r--r-- | Source/cmAddCustomCommandCommand.cxx | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt | 5 |
2 files changed, 6 insertions, 3 deletions
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\) |