echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: --build and --install error out when encountering bad flags

Browse Source 
Fixes #22186
This commit is contained in:
Robert Maynard 2021-05-12 09:44:39 -04:00
parent 928cdb17c5
commit 5aa0dec6b0
14 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/cmakemain.cxx
View File

@ -532,11 +532,22 @@ int do_build(int ac, char const* const* av)
for (; i < inputArgs.size() && !nativeOptionsPassed; ++i) {
std::string const& arg = inputArgs[i];
bool matched = false;
bool parsed = false;
for (auto const& m : arguments) {
if (m.matches(arg) && m.parse(arg, i, inputArgs)) {
matched = m.matches(arg);
if (matched) {
parsed = m.parse(arg, i, inputArgs);
break;
}
}
if (!(matched && parsed)) {
dir.clear();
if (!matched) {
std::cerr << "Unknown argument " << arg << std::endl;
}
break;
}
}
if (nativeOptionsPassed) {
@ -806,11 +817,22 @@ int do_install(int ac, char const* const* av)
for (decltype(inputArgs.size()) i = 0; i < inputArgs.size(); ++i) {
std::string const& arg = inputArgs[i];
bool matched = false;
bool parsed = false;
for (auto const& m : arguments) {
if (m.matches(arg) && m.parse(arg, i, inputArgs)) {
matched = m.matches(arg);
if (matched) {
parsed = m.parse(arg, i, inputArgs);
break;
}
}
if (!(matched && parsed)) {
dir.clear();
if (!matched) {
std::cerr << "Unknown argument " << arg << std::endl;
}
break;
}
}
}

12
Tests/RunCMake/CommandLine/RunCMakeTest.cmake
View File

@ -54,6 +54,14 @@ run_cmake_command(build-no-dir
${CMAKE_COMMAND} --build)
run_cmake_command(build-no-cache
${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR})
run_cmake_command(build-unknown-command-short
${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR} -invalid-command)
run_cmake_command(build-unknown-command-long
${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR} --invalid-command)
run_cmake_command(build-unknown-command-partial-match
${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR} --targetinvalid)
run_cmake_command(build-invalid-target-syntax
${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR} --target=invalid)
run_cmake_command(build-no-generator
${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-no-generator)
run_cmake_command(build-bad-dir
@ -65,6 +73,10 @@ run_cmake_command(install-no-dir
${CMAKE_COMMAND} --install)
run_cmake_command(install-bad-dir
${CMAKE_COMMAND} --install dir-does-not-exist)
run_cmake_command(install-unknown-command-short
${CMAKE_COMMAND} --install ${RunCMake_SOURCE_DIR} -invalid-command)
run_cmake_command(install-unknown-command-long
${CMAKE_COMMAND} --install ${RunCMake_SOURCE_DIR} --invalid-command)
run_cmake_command(install-options-to-vars
${CMAKE_COMMAND} --install ${RunCMake_SOURCE_DIR}/dir-install-options-to-vars
--strip --prefix /var/test --config sample --component pack)

1
Tests/RunCMake/CommandLine/build-invalid-target-syntax-result.txt Normal file
View File

@ -0,0 +1 @@
1

2
Tests/RunCMake/CommandLine/build-invalid-target-syntax-stderr.txt Normal file
View File

@ -0,0 +1,2 @@
^CMake Error: Invalid syntax used with --target
Usage: cmake --build \[<dir> \| --preset <preset>\] \[options\] \[-- \[native-options\]\]

1
Tests/RunCMake/CommandLine/build-unknown-command-long-result.txt Normal file
View File

@ -0,0 +1 @@
1

2
Tests/RunCMake/CommandLine/build-unknown-command-long-stderr.txt Normal file
View File

@ -0,0 +1,2 @@
^Unknown argument --invalid-command
Usage: cmake --build \[<dir> \| --preset <preset>\] \[options\] \[-- \[native-options\]\]

1
Tests/RunCMake/CommandLine/build-unknown-command-partial-match-result.txt Normal file
View File

@ -0,0 +1 @@
1

2
Tests/RunCMake/CommandLine/build-unknown-command-partial-match-stderr.txt Normal file
View File

@ -0,0 +1,2 @@
^CMake Error: Invalid syntax used with --target
Usage: cmake --build \[<dir> \| --preset <preset>\] \[options\] \[-- \[native-options\]\]

1
Tests/RunCMake/CommandLine/build-unknown-command-short-result.txt Normal file
View File

@ -0,0 +1 @@
1

2
Tests/RunCMake/CommandLine/build-unknown-command-short-stderr.txt Normal file
View File

@ -0,0 +1,2 @@
^Unknown argument -invalid-command
Usage: cmake --build \[<dir> \| --preset <preset>\] \[options\] \[-- \[native-options\]\]

1
Tests/RunCMake/CommandLine/install-unknown-command-long-result.txt Normal file
View File

@ -0,0 +1 @@
1

2
Tests/RunCMake/CommandLine/install-unknown-command-long-stderr.txt Normal file
View File

@ -0,0 +1,2 @@
^Unknown argument --invalid-command
Usage: cmake --install <dir> \[options\]

1
Tests/RunCMake/CommandLine/install-unknown-command-short-result.txt Normal file
View File

@ -0,0 +1 @@
1

2
Tests/RunCMake/CommandLine/install-unknown-command-short-stderr.txt Normal file
View File

@ -0,0 +1,2 @@
^Unknown argument -invalid-command
Usage: cmake --install <dir> \[options\]