Преглед на файлове

configure_file: Do not warn about newline style arguments

The unknown argument warning added by commit v3.2.0-rc1~452^2
(configure_file: Warn about unknown arguments, 2014-10-31) failed to
account for options handled by the NewLineStyle member instead of
directly in the main loop.  Simply whitelist them for now.
Brad King преди 10 години
родител
ревизия
3ef776fc38
променени са 1 файла, в които са добавени 7 реда и са изтрити 0 реда
  1. 7 0
      Source/cmConfigureFileCommand.cxx

+ 7 - 0
Source/cmConfigureFileCommand.cxx

@@ -100,6 +100,13 @@ bool cmConfigureFileCommand
       {
       /* Ignore legacy option.  */
       }
+    else if(args[i] == "NEWLINE_STYLE" ||
+            args[i] == "LF" || args[i] == "UNIX" ||
+            args[i] == "CRLF" || args[i] == "WIN32" ||
+            args[i] == "DOS")
+      {
+      /* Options handled by NewLineStyle member above.  */
+      }
     else
       {
       unknown_args += " ";