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 | b7485c98a09d6f29a16828beba5f67de45034ac8 (patch) | |
| tree | 7b33d6dd010a5a4c6842bf8e79f760e1b0b93610 | |
| parent | 6fc33ab44604c449426e95aa3a3485afdf1957c7 (diff) | |
| parent | e6e7f2cab96066b5e7f595177a59ea1461608201 (diff) | |
| download | CMake-b7485c98a09d6f29a16828beba5f67de45034ac8.zip CMake-b7485c98a09d6f29a16828beba5f67de45034ac8.tar.gz CMake-b7485c98a09d6f29a16828beba5f67de45034ac8.tar.bz2 | |
Merge topic 'trace_expand_bracket'
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 e4c8e4b..cea20ad 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -303,7 +303,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]]) |