diff --git a/Source/cmCMakeHostSystemInformationCommand.cxx b/Source/cmCMakeHostSystemInformationCommand.cxx index e4160a1dcd..0366030d6d 100644 --- a/Source/cmCMakeHostSystemInformationCommand.cxx +++ b/Source/cmCMakeHostSystemInformationCommand.cxx @@ -604,14 +604,14 @@ bool QueryWindowsRegistry(Range args, cmExecutionStatus& status, (arguments.ValueNames || arguments.SubKeys)) || (arguments.ValueName.empty() && arguments.ValueNames && arguments.SubKeys)) { - status.SetError("given mutually exclusive sub-options \"VALUE\", " - "\"VALUE_NAMES\" or \"SUBKEYS\"."); + status.SetError("given mutually exclusive sub-options VALUE, " + "VALUE_NAMES or SUBKEYS."); return false; } if (!arguments.View.empty() && !cmWindowsRegistry::ToView(arguments.View)) { status.SetError( - cmStrCat("given invalid value for \"VIEW\": ", arguments.View, '.')); + cmStrCat("given invalid value for VIEW: ", arguments.View, '.')); return false; } diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx index 903caa253b..5189519896 100644 --- a/Source/cmFindBase.cxx +++ b/Source/cmFindBase.cxx @@ -133,7 +133,7 @@ bool cmFindBase::ParseArguments(std::vector const& argsIn) newStyle = true; } else if (args[j] == "REGISTRY_VIEW") { if (++j == args.size()) { - this->SetError("missing required argument for \"REGISTRY_VIEW\""); + this->SetError("missing required argument for REGISTRY_VIEW"); return false; } auto view = cmWindowsRegistry::ToView(args[j]); @@ -141,18 +141,18 @@ bool cmFindBase::ParseArguments(std::vector const& argsIn) this->RegistryView = *view; } else { this->SetError( - cmStrCat("given invalid value for \"REGISTRY_VIEW\": ", args[j])); + cmStrCat("given invalid value for REGISTRY_VIEW: ", args[j])); return false; } } else if (args[j] == "VALIDATOR") { if (++j == args.size()) { - this->SetError("missing required argument for \"VALIDATOR\""); + this->SetError("missing required argument for VALIDATOR"); return false; } auto command = this->Makefile->GetState()->GetCommand(args[j]); if (!command) { this->SetError(cmStrCat( - "command specified for \"VALIDATOR\" is undefined: ", args[j], '.')); + "command specified for VALIDATOR is undefined: ", args[j], '.')); return false; } // ensure a macro is not specified as validator @@ -164,7 +164,7 @@ bool cmFindBase::ParseArguments(std::vector const& argsIn) item.c_str()) == 0; }) != macros.end()) { this->SetError(cmStrCat( - "command specified for \"VALIDATOR\" is not a function: ", args[j], + "command specified for VALIDATOR is not a function: ", args[j], '.')); return false; } diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index c18f5a98fe..12bf160b9f 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -754,7 +754,7 @@ bool cmFindPackageCommand::InitialPass(std::vector const& args) doing = DoingNone; } else if (args[i] == "REGISTRY_VIEW") { if (++i == args.size()) { - this->SetError("missing required argument for \"REGISTRY_VIEW\""); + this->SetError("missing required argument for REGISTRY_VIEW"); return false; } auto view = cmWindowsRegistry::ToView(args[i]); @@ -763,7 +763,7 @@ bool cmFindPackageCommand::InitialPass(std::vector const& args) this->RegistryViewDefined = true; } else { this->SetError( - cmStrCat("given invalid value for \"REGISTRY_VIEW\": ", args[i])); + cmStrCat("given invalid value for REGISTRY_VIEW: ", args[i])); return false; } } else if (this->CheckCommonArgument(args[i])) { diff --git a/Tests/RunCMake/cmake_host_system_information/Registry_BadView2-stderr.txt b/Tests/RunCMake/cmake_host_system_information/Registry_BadView2-stderr.txt index 201d93aca7..5a80e7e9f5 100644 --- a/Tests/RunCMake/cmake_host_system_information/Registry_BadView2-stderr.txt +++ b/Tests/RunCMake/cmake_host_system_information/Registry_BadView2-stderr.txt @@ -1,4 +1,4 @@ CMake Error at Registry_BadView2.cmake:[0-9]+ \(cmake_host_system_information\): - cmake_host_system_information given invalid value for "VIEW": BAD_VIEW. + cmake_host_system_information given invalid value for VIEW: BAD_VIEW. Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_file/REGISTRY_VIEW-no-view-stderr.txt b/Tests/RunCMake/find_file/REGISTRY_VIEW-no-view-stderr.txt index 28e3e12da7..bf08f917ca 100644 --- a/Tests/RunCMake/find_file/REGISTRY_VIEW-no-view-stderr.txt +++ b/Tests/RunCMake/find_file/REGISTRY_VIEW-no-view-stderr.txt @@ -1,4 +1,4 @@ CMake Error at REGISTRY_VIEW-no-view.cmake:[0-9]+ \(find_file\): - find_file missing required argument for "REGISTRY_VIEW" + find_file missing required argument for REGISTRY_VIEW Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_file/REGISTRY_VIEW-wrong-view-stderr.txt b/Tests/RunCMake/find_file/REGISTRY_VIEW-wrong-view-stderr.txt index 42843f3319..b1630f65fd 100644 --- a/Tests/RunCMake/find_file/REGISTRY_VIEW-wrong-view-stderr.txt +++ b/Tests/RunCMake/find_file/REGISTRY_VIEW-wrong-view-stderr.txt @@ -1,4 +1,4 @@ CMake Error at REGISTRY_VIEW-wrong-view.cmake:[0-9]+ \(find_file\): - find_file given invalid value for "REGISTRY_VIEW": WRONG_VIEW + find_file given invalid value for REGISTRY_VIEW: WRONG_VIEW Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_file/VALIDATOR-no-function-stderr.txt b/Tests/RunCMake/find_file/VALIDATOR-no-function-stderr.txt index 4d496490d6..3b0e7844e2 100644 --- a/Tests/RunCMake/find_file/VALIDATOR-no-function-stderr.txt +++ b/Tests/RunCMake/find_file/VALIDATOR-no-function-stderr.txt @@ -1,4 +1,4 @@ CMake Error at VALIDATOR-no-function.cmake:[0-9]+ \(find_file\): - find_file missing required argument for "VALIDATOR" + find_file missing required argument for VALIDATOR Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_file/VALIDATOR-specify-macro-stderr.txt b/Tests/RunCMake/find_file/VALIDATOR-specify-macro-stderr.txt index 7e0eda09b9..81ede79257 100644 --- a/Tests/RunCMake/find_file/VALIDATOR-specify-macro-stderr.txt +++ b/Tests/RunCMake/find_file/VALIDATOR-specify-macro-stderr.txt @@ -1,4 +1,4 @@ CMake Error at VALIDATOR-specify-macro.cmake:[0-9]+ \(find_file\): - find_file command specified for "VALIDATOR" is not a function: check. + find_file command specified for VALIDATOR is not a function: check. Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_file/VALIDATOR-undefined-function-stderr.txt b/Tests/RunCMake/find_file/VALIDATOR-undefined-function-stderr.txt index b4125e6aff..4e8564efd9 100644 --- a/Tests/RunCMake/find_file/VALIDATOR-undefined-function-stderr.txt +++ b/Tests/RunCMake/find_file/VALIDATOR-undefined-function-stderr.txt @@ -1,4 +1,4 @@ CMake Error at VALIDATOR-undefined-function.cmake:[0-9]+ \(find_file\): - find_file command specified for "VALIDATOR" is undefined: undefined. + find_file command specified for VALIDATOR is undefined: undefined. Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_library/REGISTRY_VIEW-no-view-stderr.txt b/Tests/RunCMake/find_library/REGISTRY_VIEW-no-view-stderr.txt index ec1877c10c..cc387ad215 100644 --- a/Tests/RunCMake/find_library/REGISTRY_VIEW-no-view-stderr.txt +++ b/Tests/RunCMake/find_library/REGISTRY_VIEW-no-view-stderr.txt @@ -1,4 +1,4 @@ CMake Error at REGISTRY_VIEW-no-view.cmake:[0-9]+ \(find_library\): - find_library missing required argument for "REGISTRY_VIEW" + find_library missing required argument for REGISTRY_VIEW Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_library/REGISTRY_VIEW-wrong-view-stderr.txt b/Tests/RunCMake/find_library/REGISTRY_VIEW-wrong-view-stderr.txt index 3e7f814a57..1a939924e0 100644 --- a/Tests/RunCMake/find_library/REGISTRY_VIEW-wrong-view-stderr.txt +++ b/Tests/RunCMake/find_library/REGISTRY_VIEW-wrong-view-stderr.txt @@ -1,4 +1,4 @@ CMake Error at REGISTRY_VIEW-wrong-view.cmake:[0-9]+ \(find_library\): - find_library given invalid value for "REGISTRY_VIEW": WRONG_VIEW + find_library given invalid value for REGISTRY_VIEW: WRONG_VIEW Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_library/VALIDATOR-no-function-stderr.txt b/Tests/RunCMake/find_library/VALIDATOR-no-function-stderr.txt index 6c04aa4dc0..4334b402d7 100644 --- a/Tests/RunCMake/find_library/VALIDATOR-no-function-stderr.txt +++ b/Tests/RunCMake/find_library/VALIDATOR-no-function-stderr.txt @@ -1,4 +1,4 @@ CMake Error at VALIDATOR-no-function.cmake:[0-9]+ \(find_library\): - find_library missing required argument for "VALIDATOR" + find_library missing required argument for VALIDATOR Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_library/VALIDATOR-specify-macro-stderr.txt b/Tests/RunCMake/find_library/VALIDATOR-specify-macro-stderr.txt index 03e7df9457..271434dbb6 100644 --- a/Tests/RunCMake/find_library/VALIDATOR-specify-macro-stderr.txt +++ b/Tests/RunCMake/find_library/VALIDATOR-specify-macro-stderr.txt @@ -1,4 +1,4 @@ CMake Error at VALIDATOR-specify-macro.cmake:[0-9]+ \(find_library\): - find_library command specified for "VALIDATOR" is not a function: check. + find_library command specified for VALIDATOR is not a function: check. Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_library/VALIDATOR-undefined-function-stderr.txt b/Tests/RunCMake/find_library/VALIDATOR-undefined-function-stderr.txt index dc7ad9ee03..ea2ab37858 100644 --- a/Tests/RunCMake/find_library/VALIDATOR-undefined-function-stderr.txt +++ b/Tests/RunCMake/find_library/VALIDATOR-undefined-function-stderr.txt @@ -1,4 +1,4 @@ CMake Error at VALIDATOR-undefined-function.cmake:[0-9]+ \(find_library\): - find_library command specified for "VALIDATOR" is undefined: undefined. + find_library command specified for VALIDATOR is undefined: undefined. Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_package/REGISTRY_VIEW-no-view-stderr.txt b/Tests/RunCMake/find_package/REGISTRY_VIEW-no-view-stderr.txt index 9dbcc93149..d628da0676 100644 --- a/Tests/RunCMake/find_package/REGISTRY_VIEW-no-view-stderr.txt +++ b/Tests/RunCMake/find_package/REGISTRY_VIEW-no-view-stderr.txt @@ -1,4 +1,4 @@ CMake Error at REGISTRY_VIEW-no-view.cmake:[0-9]+ \(find_package\): - find_package missing required argument for "REGISTRY_VIEW" + find_package missing required argument for REGISTRY_VIEW Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_package/REGISTRY_VIEW-wrong-view-stderr.txt b/Tests/RunCMake/find_package/REGISTRY_VIEW-wrong-view-stderr.txt index e65af62c7c..3820e149a6 100644 --- a/Tests/RunCMake/find_package/REGISTRY_VIEW-wrong-view-stderr.txt +++ b/Tests/RunCMake/find_package/REGISTRY_VIEW-wrong-view-stderr.txt @@ -1,4 +1,4 @@ CMake Error at REGISTRY_VIEW-wrong-view.cmake:[0-9]+ \(find_package\): - find_package given invalid value for "REGISTRY_VIEW": WRONG_VIEW + find_package given invalid value for REGISTRY_VIEW: WRONG_VIEW Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_path/REGISTRY_VIEW-no-view-stderr.txt b/Tests/RunCMake/find_path/REGISTRY_VIEW-no-view-stderr.txt index 662d2d3b4f..91c467d631 100644 --- a/Tests/RunCMake/find_path/REGISTRY_VIEW-no-view-stderr.txt +++ b/Tests/RunCMake/find_path/REGISTRY_VIEW-no-view-stderr.txt @@ -1,4 +1,4 @@ CMake Error at REGISTRY_VIEW-no-view.cmake:[0-9]+ \(find_path\): - find_path missing required argument for "REGISTRY_VIEW" + find_path missing required argument for REGISTRY_VIEW Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_path/REGISTRY_VIEW-wrong-view-stderr.txt b/Tests/RunCMake/find_path/REGISTRY_VIEW-wrong-view-stderr.txt index 075d6af5d3..8f6512ba3d 100644 --- a/Tests/RunCMake/find_path/REGISTRY_VIEW-wrong-view-stderr.txt +++ b/Tests/RunCMake/find_path/REGISTRY_VIEW-wrong-view-stderr.txt @@ -1,4 +1,4 @@ CMake Error at REGISTRY_VIEW-wrong-view.cmake:[0-9]+ \(find_path\): - find_path given invalid value for "REGISTRY_VIEW": WRONG_VIEW + find_path given invalid value for REGISTRY_VIEW: WRONG_VIEW Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_path/VALIDATOR-no-function-stderr.txt b/Tests/RunCMake/find_path/VALIDATOR-no-function-stderr.txt index 1dfd06499e..60b6e14937 100644 --- a/Tests/RunCMake/find_path/VALIDATOR-no-function-stderr.txt +++ b/Tests/RunCMake/find_path/VALIDATOR-no-function-stderr.txt @@ -1,4 +1,4 @@ CMake Error at VALIDATOR-no-function.cmake:[0-9]+ \(find_path\): - find_path missing required argument for "VALIDATOR" + find_path missing required argument for VALIDATOR Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_path/VALIDATOR-specify-macro-stderr.txt b/Tests/RunCMake/find_path/VALIDATOR-specify-macro-stderr.txt index 92ee17ee58..fef753947e 100644 --- a/Tests/RunCMake/find_path/VALIDATOR-specify-macro-stderr.txt +++ b/Tests/RunCMake/find_path/VALIDATOR-specify-macro-stderr.txt @@ -1,4 +1,4 @@ CMake Error at VALIDATOR-specify-macro.cmake:[0-9]+ \(find_path\): - find_path command specified for "VALIDATOR" is not a function: check. + find_path command specified for VALIDATOR is not a function: check. Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_path/VALIDATOR-undefined-function-stderr.txt b/Tests/RunCMake/find_path/VALIDATOR-undefined-function-stderr.txt index d3e05176aa..10a59953d9 100644 --- a/Tests/RunCMake/find_path/VALIDATOR-undefined-function-stderr.txt +++ b/Tests/RunCMake/find_path/VALIDATOR-undefined-function-stderr.txt @@ -1,4 +1,4 @@ CMake Error at VALIDATOR-undefined-function.cmake:[0-9]+ \(find_path\): - find_path command specified for "VALIDATOR" is undefined: undefined. + find_path command specified for VALIDATOR is undefined: undefined. Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_program/REGISTRY_VIEW-no-view-stderr.txt b/Tests/RunCMake/find_program/REGISTRY_VIEW-no-view-stderr.txt index dbe38a146f..3fe7b7f0d5 100644 --- a/Tests/RunCMake/find_program/REGISTRY_VIEW-no-view-stderr.txt +++ b/Tests/RunCMake/find_program/REGISTRY_VIEW-no-view-stderr.txt @@ -1,4 +1,4 @@ CMake Error at REGISTRY_VIEW-no-view.cmake:[0-9]+ \(find_program\): - find_program missing required argument for "REGISTRY_VIEW" + find_program missing required argument for REGISTRY_VIEW Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_program/REGISTRY_VIEW-wrong-view-stderr.txt b/Tests/RunCMake/find_program/REGISTRY_VIEW-wrong-view-stderr.txt index de07095128..4a5cfaf489 100644 --- a/Tests/RunCMake/find_program/REGISTRY_VIEW-wrong-view-stderr.txt +++ b/Tests/RunCMake/find_program/REGISTRY_VIEW-wrong-view-stderr.txt @@ -1,4 +1,4 @@ CMake Error at REGISTRY_VIEW-wrong-view.cmake:[0-9]+ \(find_program\): - find_program given invalid value for "REGISTRY_VIEW": WRONG_VIEW + find_program given invalid value for REGISTRY_VIEW: WRONG_VIEW Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_program/VALIDATOR-no-function-stderr.txt b/Tests/RunCMake/find_program/VALIDATOR-no-function-stderr.txt index b8868af5ba..48486f4b70 100644 --- a/Tests/RunCMake/find_program/VALIDATOR-no-function-stderr.txt +++ b/Tests/RunCMake/find_program/VALIDATOR-no-function-stderr.txt @@ -1,4 +1,4 @@ CMake Error at VALIDATOR-no-function.cmake:[0-9]+ \(find_program\): - find_program missing required argument for "VALIDATOR" + find_program missing required argument for VALIDATOR Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_program/VALIDATOR-specify-macro-stderr.txt b/Tests/RunCMake/find_program/VALIDATOR-specify-macro-stderr.txt index 1ae51481b4..fd51d07e88 100644 --- a/Tests/RunCMake/find_program/VALIDATOR-specify-macro-stderr.txt +++ b/Tests/RunCMake/find_program/VALIDATOR-specify-macro-stderr.txt @@ -1,4 +1,4 @@ CMake Error at VALIDATOR-specify-macro.cmake:[0-9]+ \(find_program\): - find_program command specified for "VALIDATOR" is not a function: check. + find_program command specified for VALIDATOR is not a function: check. Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_program/VALIDATOR-undefined-function-stderr.txt b/Tests/RunCMake/find_program/VALIDATOR-undefined-function-stderr.txt index a89ffa079a..889a2ca0a9 100644 --- a/Tests/RunCMake/find_program/VALIDATOR-undefined-function-stderr.txt +++ b/Tests/RunCMake/find_program/VALIDATOR-undefined-function-stderr.txt @@ -1,4 +1,4 @@ CMake Error at VALIDATOR-undefined-function.cmake:[0-9]+ \(find_program\): - find_program command specified for "VALIDATOR" is undefined: undefined. + find_program command specified for VALIDATOR is undefined: undefined. Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\)