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

cmake: Stop parsing after -- when detecting script mode

Browse Source 
Fixes #24220
This commit is contained in:
Robert Maynard 2022-12-06 10:46:40 -05:00
parent aeac9b4660
commit 08aa516880
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmakemain.cxx
View File

@ -311,6 +311,11 @@ 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]);

10
Tests/RunCMake/CommandLine/P_P_in_arbitrary_args-stdout.txt Normal file
View File

@ -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='[^']*/Tests/RunCMake/CommandLine/non_existing.cmake'
-- CMAKE_ARGV6=''
-- CMAKE_ARGV7=''
-- CMAKE_ARGV8=''
-- CMAKE_ARGV9=''$

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

@ -54,6 +54,7 @@ run_cmake_command(P_no-arg ${CMAKE_COMMAND} -P)
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_fresh ${CMAKE_COMMAND} -P "${RunCMake_SOURCE_DIR}/P_fresh.cmake" --fresh)
run_cmake_command(build-no-dir