From 61143d7cefcfa5db42339fb34ed4d96ba66ed7ab Mon Sep 17 00:00:00 2001 From: Matthew Woehlke Date: Mon, 1 Dec 2025 14:08:56 -0500 Subject: [PATCH] export: Improve error message consistency Remove literal text "subcommand" from error messages. Most other commands report errors like " ", where the message does not include the literal text "subcommand". The `export` command was one of two exceptions to this. --- Source/cmExportCommand.cxx | 8 +++---- .../ExportPackageInfo/BadArgs4-stderr.txt | 22 +++++++++---------- .../ExperimentalGate-stderr.txt | 2 +- Tests/RunCMake/export/AppendExport-stderr.txt | 2 +- .../FindDependencyExportGate-stderr.txt | 3 +-- Tests/RunCMake/export/OldIface-stderr.txt | 3 +-- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index 6a7a67f879..e098ad3a69 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -270,8 +270,8 @@ static bool HandleExportMode(std::vector const& args, } if (!unknownArgs.empty()) { - status.SetError("EXPORT subcommand given unknown argument: \"" + - unknownArgs.front() + "\"."); + status.SetError("EXPORT given unknown argument: \"" + unknownArgs.front() + + "\"."); return false; } @@ -384,8 +384,8 @@ static bool HandleSetupMode(std::vector const& args, SetupArguments arguments = parser.Parse(args, &unknownArgs); if (!unknownArgs.empty()) { - status.SetError("SETUP subcommand given unknown argument: \"" + - unknownArgs.front() + "\"."); + status.SetError("SETUP given unknown argument: \"" + unknownArgs.front() + + "\"."); return false; } diff --git a/Tests/RunCMake/ExportPackageInfo/BadArgs4-stderr.txt b/Tests/RunCMake/ExportPackageInfo/BadArgs4-stderr.txt index f31cd5efd2..e9627f98f2 100644 --- a/Tests/RunCMake/ExportPackageInfo/BadArgs4-stderr.txt +++ b/Tests/RunCMake/ExportPackageInfo/BadArgs4-stderr.txt @@ -1,64 +1,64 @@ CMake Error at BadArgs4\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: "LOWER_CASE_FILE"\. + export EXPORT given unknown argument: "LOWER_CASE_FILE"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) CMake Error at BadArgs4\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: "APPENDIX"\. + export EXPORT given unknown argument: "APPENDIX"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) CMake Error at BadArgs4\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: "VERSION"\. + export EXPORT given unknown argument: "VERSION"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) CMake Error at BadArgs4\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: "LICENSE"\. + export EXPORT given unknown argument: "LICENSE"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) CMake Error at BadArgs4\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: "DEFAULT_LICENSE"\. + export EXPORT given unknown argument: "DEFAULT_LICENSE"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) CMake Error at BadArgs4\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: "DESCRIPTION"\. + export EXPORT given unknown argument: "DESCRIPTION"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) CMake Error at BadArgs4\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: "HOMEPAGE_URL"\. + export EXPORT given unknown argument: "HOMEPAGE_URL"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) CMake Error at BadArgs4\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: "DEFAULT_TARGETS"\. + export EXPORT given unknown argument: "DEFAULT_TARGETS"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) CMake Error at BadArgs4\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: "DEFAULT_CONFIGURATIONS"\. + export EXPORT given unknown argument: "DEFAULT_CONFIGURATIONS"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) CMake Error at BadArgs4\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: "PROJECT"\. + export EXPORT given unknown argument: "PROJECT"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) CMake Error at BadArgs4\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: "NO_PROJECT_METADATA"\. + export EXPORT given unknown argument: "NO_PROJECT_METADATA"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) diff --git a/Tests/RunCMake/ExportPackageInfo/ExperimentalGate-stderr.txt b/Tests/RunCMake/ExportPackageInfo/ExperimentalGate-stderr.txt index a9211394e0..183d000d71 100644 --- a/Tests/RunCMake/ExportPackageInfo/ExperimentalGate-stderr.txt +++ b/Tests/RunCMake/ExportPackageInfo/ExperimentalGate-stderr.txt @@ -1,2 +1,2 @@ CMake Error at ExperimentalGate\.cmake:5 \(export\): - export EXPORT subcommand given unknown argument: "PACKAGE_INFO"\. + export EXPORT given unknown argument: "PACKAGE_INFO"\. diff --git a/Tests/RunCMake/export/AppendExport-stderr.txt b/Tests/RunCMake/export/AppendExport-stderr.txt index 9d483db035..1e67bca9e1 100644 --- a/Tests/RunCMake/export/AppendExport-stderr.txt +++ b/Tests/RunCMake/export/AppendExport-stderr.txt @@ -1,4 +1,4 @@ CMake Error at AppendExport\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: "APPEND"\. + export EXPORT given unknown argument: "APPEND"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) diff --git a/Tests/RunCMake/export/FindDependencyExportGate-stderr.txt b/Tests/RunCMake/export/FindDependencyExportGate-stderr.txt index f51fc9ab3e..9af9547c9b 100644 --- a/Tests/RunCMake/export/FindDependencyExportGate-stderr.txt +++ b/Tests/RunCMake/export/FindDependencyExportGate-stderr.txt @@ -1,5 +1,4 @@ ^CMake Error at FindDependencyExportGate\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: - "EXPORT_PACKAGE_DEPENDENCIES"\. + export EXPORT given unknown argument: "EXPORT_PACKAGE_DEPENDENCIES"\. Call Stack \(most recent call first\): CMakeLists\.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/export/OldIface-stderr.txt b/Tests/RunCMake/export/OldIface-stderr.txt index 2f44d31a2b..2f568459b7 100644 --- a/Tests/RunCMake/export/OldIface-stderr.txt +++ b/Tests/RunCMake/export/OldIface-stderr.txt @@ -1,5 +1,4 @@ CMake Error at OldIface\.cmake:[0-9]+ \(export\): - export EXPORT subcommand given unknown argument: - "EXPORT_LINK_INTERFACE_LIBRARIES"\. + export EXPORT given unknown argument: "EXPORT_LINK_INTERFACE_LIBRARIES"\. Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\)