Browse Source

Merge branch 'autogen-empty-source-file-fix' into release-3.10

There is no corresponding merge request because this fix was
cherry-picked specifically for CMake 3.10.
pull/320/head
Brad King 8 years ago
parent
commit
760c6c08a5
  1. 20
      Source/cmQtAutoGenerators.cxx

20
Source/cmQtAutoGenerators.cxx

@ -80,15 +80,21 @@ static bool ReadFile(std::string& content, std::string const& filename,
std::size_t const length = cmSystemTools::FileLength(filename); std::size_t const length = cmSystemTools::FileLength(filename);
cmsys::ifstream ifs(filename.c_str(), (std::ios::in | std::ios::binary)); cmsys::ifstream ifs(filename.c_str(), (std::ios::in | std::ios::binary));
if (ifs) { if (ifs) {
content.resize(length);
ifs.read(&content.front(), content.size());
if (ifs) {
success = true;
if (length > 0) {
content.resize(length);
ifs.read(&content.front(), content.size());
if (ifs) {
success = true;
} else {
content.clear();
if (error != nullptr) {
error->append("Reading from the file failed.");
}
}
} else { } else {
// Readable but empty file
content.clear(); content.clear();
if (error != nullptr) {
error->append("Reading from the file failed.");
}
success = true;
} }
} else if (error != nullptr) { } else if (error != nullptr) {
error->append("Opening the file for reading failed."); error->append("Opening the file for reading failed.");

Loading…
Cancel
Save