From 3ef776fc38fecff332e568f307dcf4e6f82fbe14 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 9 Mar 2015 08:38:21 -0400 Subject: 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. --- Source/cmConfigureFileCommand.cxx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/cmConfigureFileCommand.cxx b/Source/cmConfigureFileCommand.cxx index fa7f486..6876388 100644 --- a/Source/cmConfigureFileCommand.cxx +++ b/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 += " "; -- cgit v0.12