瀏覽代碼

Merge topic 'trace_expand_bracket' into release-3.19

e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5687
Brad King 4 年之前
父節點
當前提交
4304767ae4
共有 2 個文件被更改,包括 2 次插入1 次删除
  1. 1 1
      Source/cmMakefile.cxx
  2. 1 0
      Tests/RunCMake/CommandLine/trace-expand.cmake

+ 1 - 1
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);

+ 1 - 0
Tests/RunCMake/CommandLine/trace-expand.cmake

@@ -0,0 +1 @@
+set(a [[\B]])