diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-17 10:50:13 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-17 10:50:13 -0400 |
| commit | 9efee16a7a092555d4bc40498a1acd957943a834 (patch) | |
| tree | 718263cbe7aa3f8f9811fc9cf6daf23613dcb8d1 /Source | |
| parent | f4e5a0e6aa598f7cf0f34c2d7fea54e518615443 (diff) | |
| parent | e8fdd5f12a379ce91adcb88acdb4354bc271c911 (diff) | |
| download | cmake-9efee16a7a092555d4bc40498a1acd957943a834.tar.gz | |
Merge topic 'ninja-autogen'
e8fdd5f1 QtAutogen: Workaround rcc CRCRLF newlines on Windows (#15459)
15f1a6b4 Tests/QtAutogen: Avoid touching files in the source tree
3f7c7c65 Tests/QtAutogen: Help Qt5Autogen test find Qt5 on Windows
26b5cc5e Tests/QtAutogen: Enable per-config source tests when possible
45566408 Tests/QtAutogen: Require CMake 3.1 to set policies everywhere
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 4d0b3f4ad8..d49e997875 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -202,6 +202,13 @@ std::string cmQtAutoGenerators::ListQt5RccInputs(cmSourceFile* sf, std::string oline; while(std::getline(ostr, oline)) { + // Strip CR characters rcc may have printed (possibly more than one!). + std::string::size_type cr = oline.find('\r'); + if (cr != oline.npos) + { + oline = oline.substr(0, cr); + } + if (oline.empty()) { // The output of rcc --list contains many empty lines. |