mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 05:11:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cmake-E-compare_files-stderr'

Browse Source 
a7d44d55ae cmake: remove -E compare_files error message if files differ

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Heider <axelheider@gmx.de>
Merge-request: !4867
This commit is contained in:
Brad King
2020-06-11 11:45:10 +00:00
committed by Kitware Robot
parent 7791e8d1b6 a7d44d55ae
commit d264270307
3 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmcmd.cxx
View File

@@ -586,8 +586,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args)
}
if (filesDiffer) {
std::cerr << "Files \"" << args[args.size() - 2] << "\" to \""
<< args[args.size() - 1] << "\" are different.\n";
return 1;
}
return 0;

1
Tests/RunCMake/CommandLine/E_compare_files-different-eol-stderr.txt
View File

@@ -1 +0,0 @@
^Files ".*/compare_files/lf" to ".*/compare_files/crlf" are different.$

1
Tests/RunCMake/CommandLine/E_compare_files-ignore-eol-nonexistent-stderr.txt
View File

@@ -1 +0,0 @@
^Files "nonexistent_a" to "nonexistent_b" are different.$