Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 14:08:35 +08:00
Code Issues Projects Releases Wiki Activity

add_custom_command: Format files in error message in a single line

Browse Source
This commit is contained in:
Daniel Eiband
2019-09-23 23:39:07 +02:00
parent a1cc6b4447
commit fd3a394614
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmAddCustomCommandCommand.cxx
View File

@@ -320,8 +320,8 @@ bool cmAddCustomCommandCommand(std::vector<std::string> const& args,
// No command for this output exists. // No command for this output exists.
status.SetError( status.SetError(
cmStrCat("given APPEND option with output\n\"", output[0], cmStrCat("given APPEND option with output\n ", output[0],
"\"\nwhich is not already a custom command output.")); "\nwhich is not already a custom command output."));
return false; return false;
} }

4
Source/cmCheckCustomOutputs.cxx
View File

@@ -17,8 +17,8 @@ bool cmCheckCustomOutputs(const std::vector<std::string>& outputs,
// directory during an out of source build. // directory during an out of source build.
if (!mf.CanIWriteThisFile(o)) { if (!mf.CanIWriteThisFile(o)) {
status.SetError( status.SetError(
cmStrCat("attempted to have a file\n\"", o, cmStrCat("attempted to have a file\n ", o,
"\"\nin a source directory as an output of custom command.")); "\nin a source directory as an output of custom command."));
cmSystemTools::SetFatalErrorOccured(); cmSystemTools::SetFatalErrorOccured();
return false; return false;
} }

2
Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
View File

@@ -1,7 +1,7 @@
CMake Error at AppendNotOutput.cmake:1 \(add_custom_command\): 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.* .*RunCMake/add_custom_command/AppendNotOutput-build/out
which is not already a custom command output. which is not already a custom command output.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):

2
Tests/RunCMake/add_custom_command/BadByproduct-stderr.txt
View File

@@ -29,7 +29,7 @@ Call Stack \(most recent call first\):
CMake Error at BadByproduct.cmake:6 \(add_custom_command\): CMake Error at BadByproduct.cmake:6 \(add_custom_command\):
add_custom_command attempted to have a file add_custom_command attempted to have a file
.*/f".* .*RunCMake/add_custom_command/f
in a source directory as an output of custom command. in a source directory as an output of custom command.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):

2
Tests/RunCMake/add_custom_command/BadOutput-stderr.txt
View File

@@ -29,7 +29,7 @@ Call Stack \(most recent call first\):
CMake Error at BadOutput.cmake:6 \(add_custom_command\): CMake Error at BadOutput.cmake:6 \(add_custom_command\):
add_custom_command attempted to have a file add_custom_command attempted to have a file
.*/e".* .*RunCMake/add_custom_command/e
in a source directory as an output of custom command. in a source directory as an output of custom command.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):

2
Tests/RunCMake/add_custom_target/BadByproduct-stderr.txt
View File

@@ -29,7 +29,7 @@ Call Stack \(most recent call first\):
CMake Error at BadByproduct.cmake:6 \(add_custom_target\): CMake Error at BadByproduct.cmake:6 \(add_custom_target\):
add_custom_target attempted to have a file add_custom_target attempted to have a file
.*/j".* .*RunCMake/add_custom_target/j
in a source directory as an output of custom command. in a source directory as an output of custom command.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):