diff options
| author | Robert Maynard <rmaynard@nvidia.com> | 2023-02-08 16:38:21 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-02-08 17:21:10 -0500 |
| commit | f9e8a067c254c711d8628356c23c402882557058 (patch) | |
| tree | 418f430ba416a9390401e66f48d63e6d8b125713 | |
| parent | 2a0c105cf08190284b288057c693eeddef5066fc (diff) | |
| download | cmake-f9e8a067c254c711d8628356c23c402882557058.tar.gz | |
cmake: Stop parsing after `--` when detecting script mode
The fix in commit 08aa516880 (cmake: Stop parsing after `--` when
detecting script mode, 2022-12-06, v3.26.0-rc1~216^2) only corrected the
case where `-P -- -P <arg>` occurred and not `-P -- -P -<other>`.
Fixes: #24220
| -rw-r--r-- | Source/cmakemain.cxx | 12 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/P_P_in_arbitrary_args_2-stdout.txt | 10 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 1 |
3 files changed, 18 insertions, 5 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 1e02412548..f4e602bf02 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -303,6 +303,13 @@ int do_cmake(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; + + // Only in script mode do we stop parsing instead + // of preferring the last mode flag provided + if (arg == "--" && workingMode == cmake::SCRIPT_MODE) { + parsedArgs = inputArgs; + break; + } for (auto const& m : arguments) { if (m.matches(arg)) { matched = true; @@ -311,11 +318,6 @@ int do_cmake(int ac, char const* const* av) } return 1; // failed to parse } - // Only in script mode do we stop parsing instead - // of preferring the last mode flag provided - if (arg == "--" && workingMode == cmake::SCRIPT_MODE) { - break; - } } if (!matched) { parsedArgs.emplace_back(av[i]); diff --git a/Tests/RunCMake/CommandLine/P_P_in_arbitrary_args_2-stdout.txt b/Tests/RunCMake/CommandLine/P_P_in_arbitrary_args_2-stdout.txt new file mode 100644 index 0000000000..ad386bd98d --- /dev/null +++ b/Tests/RunCMake/CommandLine/P_P_in_arbitrary_args_2-stdout.txt @@ -0,0 +1,10 @@ +^-- CMAKE_ARGC='6' +-- CMAKE_ARGV1='-P' +-- CMAKE_ARGV2='[^']*/Tests/RunCMake/CommandLine/P_arbitrary_args.cmake' +-- CMAKE_ARGV3='--' +-- CMAKE_ARGV4='-P' +-- CMAKE_ARGV5='-o' +-- CMAKE_ARGV6='' +-- CMAKE_ARGV7='' +-- CMAKE_ARGV8='' +-- CMAKE_ARGV9=''$ diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index f48e8453b8..943be248ce 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -56,6 +56,7 @@ run_cmake_command(P_no-file ${CMAKE_COMMAND} -P nosuchscriptfile.cmake) run_cmake_command(P_args ${CMAKE_COMMAND} -P "${RunCMake_SOURCE_DIR}/P_args.cmake" relative/path "${RunCMake_SOURCE_DIR}") run_cmake_command(P_arbitrary_args ${CMAKE_COMMAND} -P "${RunCMake_SOURCE_DIR}/P_arbitrary_args.cmake" -- -DFOO -S -B --fresh --version) run_cmake_command(P_P_in_arbitrary_args ${CMAKE_COMMAND} -P "${RunCMake_SOURCE_DIR}/P_arbitrary_args.cmake" -- -P "${RunCMake_SOURCE_DIR}/non_existing.cmake") +run_cmake_command(P_P_in_arbitrary_args_2 ${CMAKE_COMMAND} -P "${RunCMake_SOURCE_DIR}/P_arbitrary_args.cmake" -- -P -o) run_cmake_command(P_fresh ${CMAKE_COMMAND} -P "${RunCMake_SOURCE_DIR}/P_fresh.cmake" --fresh) run_cmake_command(build-no-dir |