ENH: change ADDITIONAL_MAKE_CLEAN_FILES to work with spaces in the path and on windows with no spaces

1 files changed, 9 insertions, 2 deletions

diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx
index 1b61c9b397..27dc4af655 100644
--- a/Source/cmLocalUnixMakefileGenerator.cxx
+++ b/Source/cmLocalUnixMakefileGenerator.cxx
@@ -645,11 +645,18 @@ void cmLocalUnixMakefileGenerator::OutputTargetRules(std::ostream& fout)
       }
     }
   fout << "\n\n";
-  const char * additional_clean_files = m_Makefile->GetDefinition("ADDITIONAL_MAKE_CLEAN_FILES");
+  const char * additional_clean_files =
+    m_Makefile->GetDefinition("ADDITIONAL_MAKE_CLEAN_FILES");
   if ( additional_clean_files && strlen(additional_clean_files) > 0 )
     {
+    std::string arg = additional_clean_files;
+    std::vector<std::string> args;
+    cmSystemTools::ExpandListArgument(arg, args);
     fout << "ADDITIONAL_MAKE_CLEAN_FILES = ";
-    fout << additional_clean_files;
+    for(std::vector<std::string>::iterator i = args.begin(); i != args.end(); ++i)
+      {
+      fout << this->ConvertToRelativeOutputPath(i->c_str()) << " ";
+      }
     fout << "\n\n";
     }
   const char * qt_files = m_Makefile->GetDefinition("GENERATED_QT_FILES");