summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/cmAddCustomCommandCommand.cxx4
-rw-r--r--Source/cmCheckCustomOutputs.cxx4
-rw-r--r--Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt2
-rw-r--r--Tests/RunCMake/add_custom_command/BadByproduct-stderr.txt2
-rw-r--r--Tests/RunCMake/add_custom_command/BadOutput-stderr.txt2
-rw-r--r--Tests/RunCMake/add_custom_target/BadByproduct-stderr.txt2
6 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx
index 9d665c4..94de851 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -320,8 +320,8 @@ bool cmAddCustomCommandCommand(std::vector<std::string> const& args,
// No command for this output exists.
status.SetError(
- cmStrCat("given APPEND option with output\n\"", output[0],
- "\"\nwhich is not already a custom command output."));
+ cmStrCat("given APPEND option with output\n ", output[0],
+ "\nwhich is not already a custom command output."));
return false;
}
diff --git a/Source/cmCheckCustomOutputs.cxx b/Source/cmCheckCustomOutputs.cxx
index a401738..7645c88 100644
--- a/Source/cmCheckCustomOutputs.cxx
+++ b/Source/cmCheckCustomOutputs.cxx
@@ -17,8 +17,8 @@ bool cmCheckCustomOutputs(const std::vector<std::string>& outputs,
// directory during an out of source build.
if (!mf.CanIWriteThisFile(o)) {
status.SetError(
- cmStrCat("attempted to have a file\n\"", o,
- "\"\nin a source directory as an output of custom command."));
+ cmStrCat("attempted to have a file\n ", o,
+ "\nin a source directory as an output of custom command."));
cmSystemTools::SetFatalErrorOccured();
return false;
}
diff --git a/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt b/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
index cd542d8..b7ee23a 100644
--- a/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
+++ b/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
@@ -1,7 +1,7 @@
CMake Error at AppendNotOutput.cmake:1 \(add_custom_command\):
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.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/add_custom_command/BadByproduct-stderr.txt b/Tests/RunCMake/add_custom_command/BadByproduct-stderr.txt
index 97b9cca..086e397 100644
--- a/Tests/RunCMake/add_custom_command/BadByproduct-stderr.txt
+++ b/Tests/RunCMake/add_custom_command/BadByproduct-stderr.txt
@@ -29,7 +29,7 @@ Call Stack \(most recent call first\):
CMake Error at BadByproduct.cmake:6 \(add_custom_command\):
add_custom_command attempted to have a file
- .*/f".*
+ .*RunCMake/add_custom_command/f
in a source directory as an output of custom command.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/add_custom_command/BadOutput-stderr.txt b/Tests/RunCMake/add_custom_command/BadOutput-stderr.txt
index 584aa88..731e58d 100644
--- a/Tests/RunCMake/add_custom_command/BadOutput-stderr.txt
+++ b/Tests/RunCMake/add_custom_command/BadOutput-stderr.txt
@@ -29,7 +29,7 @@ Call Stack \(most recent call first\):
CMake Error at BadOutput.cmake:6 \(add_custom_command\):
add_custom_command attempted to have a file
- .*/e".*
+ .*RunCMake/add_custom_command/e
in a source directory as an output of custom command.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/add_custom_target/BadByproduct-stderr.txt b/Tests/RunCMake/add_custom_target/BadByproduct-stderr.txt
index 7390e6a..0f58550 100644
--- a/Tests/RunCMake/add_custom_target/BadByproduct-stderr.txt
+++ b/Tests/RunCMake/add_custom_target/BadByproduct-stderr.txt
@@ -29,7 +29,7 @@ Call Stack \(most recent call first\):
CMake Error at BadByproduct.cmake:6 \(add_custom_target\):
add_custom_target attempted to have a file
- .*/j".*
+ .*RunCMake/add_custom_target/j
in a source directory as an output of custom command.
Call Stack \(most recent call first\):