diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-10 13:12:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-10 13:12:24 (GMT) |
| commit | fa4617b7ea00474053b3d0278f316db226322626 (patch) | |
| tree | 032d1d5803c63d203325a5477a83c4354e54049b /Source | |
| parent | a5505c4c53672a55f5e9e577ffb0ac3bd78c7847 (diff) | |
| parent | 024e25e485f8d1dbca40521fbc0bcd61e383f413 (diff) | |
| download | CMake-fa4617b7ea00474053b3d0278f316db226322626.zip CMake-fa4617b7ea00474053b3d0278f316db226322626.tar.gz CMake-fa4617b7ea00474053b3d0278f316db226322626.tar.bz2 | |
Merge topic 'configure_file-NEWLINE_STYLE-no-warn'
024e25e4 Tests: Add more signature tests to RunCMake.configure_file test
3ef776fc configure_file: Do not warn about newline style arguments
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 += " "; |