diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-09 13:20:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-03-09 13:20:58 (GMT) |
| commit | 77f3804ab2c10228b55ce8f5d255ba5bef1537c1 (patch) | |
| tree | f704e9ab46f8dd8f7b5a0e1f840dde0e330898d8 /Source | |
| parent | cc1ee21383c0eb18620a2bcb028c1ebc56e8fd12 (diff) | |
| parent | 024e25e485f8d1dbca40521fbc0bcd61e383f413 (diff) | |
| download | CMake-77f3804ab2c10228b55ce8f5d255ba5bef1537c1.zip CMake-77f3804ab2c10228b55ce8f5d255ba5bef1537c1.tar.gz CMake-77f3804ab2c10228b55ce8f5d255ba5bef1537c1.tar.bz2 | |
Merge branch 'configure_file-NEWLINE_STYLE-no-warn' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmConfigureFileCommand.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
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 += " "; |