diff options
| author | Taylor Braun-Jones <taylor@braun-jones.org> | 2019-01-09 18:02:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-28 13:24:50 (GMT) |
| commit | a5098cad94c152e397b258be69ae152eb1bda3df (patch) | |
| tree | 75055f8a973456e38b65b4f6db9961858c66ddb5 /Help | |
| parent | 40628b2519ae1553a33f701cf46ee8fbbd013b85 (diff) | |
| download | CMake-a5098cad94c152e397b258be69ae152eb1bda3df.zip CMake-a5098cad94c152e397b258be69ae152eb1bda3df.tar.gz CMake-a5098cad94c152e397b258be69ae152eb1bda3df.tar.bz2 | |
cmake: Add --ignore-eol option to `-E compare_files` command
Fixes: #13007
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake.1.rst | 5 | ||||
| -rw-r--r-- | Help/release/dev/compare_files-ignore-eol.rst | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 915e0d4..eaf57a0 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -373,9 +373,10 @@ Available commands are: ``chdir <dir> <cmd> [<arg>...]`` Change the current working directory and run a command. -``compare_files <file1> <file2>`` +``compare_files [--ignore-eol] <file1> <file2>`` Check if ``<file1>`` is same as ``<file2>``. If files are the same, - then returns 0, if not it returns 1. + then returns 0, if not it returns 1. The ``--ignore-eol`` option + implies line-wise comparison and ignores LF/CRLF differences. ``copy <file>... <destination>`` Copy files to ``<destination>`` (either file or directory). diff --git a/Help/release/dev/compare_files-ignore-eol.rst b/Help/release/dev/compare_files-ignore-eol.rst new file mode 100644 index 0000000..bc32921 --- /dev/null +++ b/Help/release/dev/compare_files-ignore-eol.rst @@ -0,0 +1,6 @@ +compare_files-ignore-eol +------------------------ + +* The :manual:`cmake(1)` ``-E compare_files`` command learned a new + ``--ignore-eol`` option to specify that end-of-line differences (e.g. LF vs + CRLF) should be ignored when comparing files. |