diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-12 15:20:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-12 15:20:26 (GMT) |
| commit | 4304767ae4852a0f0c07bb4acde106236df35718 (patch) | |
| tree | ba6cc25ac9270528b64412a42acaddc781060293 | |
| parent | c3c63801f85b442fcd6ac6d1208d6375714f1fc1 (diff) | |
| parent | e6e7f2cab96066b5e7f595177a59ea1461608201 (diff) | |
| download | CMake-4304767ae4852a0f0c07bb4acde106236df35718.zip CMake-4304767ae4852a0f0c07bb4acde106236df35718.tar.gz CMake-4304767ae4852a0f0c07bb4acde106236df35718.tar.bz2 | |
Merge topic 'trace_expand_bracket' into release-3.19
e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5687
| -rw-r--r-- | Source/cmMakefile.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/trace-expand.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 0e4f888..3946841 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -308,7 +308,7 @@ void cmMakefile::PrintCommandTrace( args.reserve(lff.Arguments().size()); for (cmListFileArgument const& arg : lff.Arguments()) { - if (expand) { + if (expand && arg.Delim != cmListFileArgument::Bracket) { temp = arg.Value; this->ExpandVariablesInString(temp); args.push_back(temp); diff --git a/Tests/RunCMake/CommandLine/trace-expand.cmake b/Tests/RunCMake/CommandLine/trace-expand.cmake index e69de29..24da02a 100644 --- a/Tests/RunCMake/CommandLine/trace-expand.cmake +++ b/Tests/RunCMake/CommandLine/trace-expand.cmake @@ -0,0 +1 @@ +set(a [[\B]]) |