Home Explore Help
Register Sign In
Apq
/
CMake
mirror of https://github.com/Kitware/CMake.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

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 years ago
parent
c3c63801f8 e6e7f2cab9
commit
4304767ae4
2 changed files with 2 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      Source/cmMakefile.cxx
  2. 1 0
      Tests/RunCMake/CommandLine/trace-expand.cmake

+ 1 - 1
Source/cmMakefile.cxx
View File 

@@ -308,7 +308,7 @@ void cmMakefile::PrintCommandTrace(
 
 
 
   args.reserve(lff.Arguments().size());
 
   args.reserve(lff.Arguments().size());
 
   for (cmListFileArgument const& arg : lff.Arguments()) {
 
   for (cmListFileArgument const& arg : lff.Arguments()) {
 
-    if (expand) {
 
+    if (expand && arg.Delim != cmListFileArgument::Bracket) {
 
       temp = arg.Value;
 
       temp = arg.Value;
 
       this->ExpandVariablesInString(temp);
 
       this->ExpandVariablesInString(temp);
 
       args.push_back(temp);
 
       args.push_back(temp);

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

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