diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestSVN.cxx | 5 | ||||
| -rw-r--r-- | Source/cmExecuteProcessCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx index fc405ca..410e0d4 100644 --- a/Source/CTest/cmCTestSVN.cxx +++ b/Source/CTest/cmCTestSVN.cxx @@ -523,8 +523,11 @@ private: void cmCTestSVN::LoadRepositories() { + if (!this->Repositories.empty()) { + return; + } + // Info for root repository - this->Repositories.clear(); this->Repositories.push_back(SVNInfo("")); this->RootInfo = &(this->Repositories.back()); diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx index eb26a50..92cdf64 100644 --- a/Source/cmExecuteProcessCommand.cxx +++ b/Source/cmExecuteProcessCommand.cxx @@ -47,7 +47,7 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args, std::string error_variable; std::string result_variable; std::string working_directory; - cmProcessOutput::Encoding encoding = cmProcessOutput::Auto; + cmProcessOutput::Encoding encoding = cmProcessOutput::None; for (size_t i = 0; i < args.size(); ++i) { if (args[i] == "COMMAND") { doing_command = true; diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index c84fe4f..1d6972b 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -655,10 +655,10 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile) it != this->Headers.end(); ++it) { const std::string& headerName = *it; if (!this->MocSkipTest(headerName)) { - headerFilesMoc.insert(this->Headers.begin(), this->Headers.end()); + headerFilesMoc.insert(headerName); } if (!this->UicSkipTest(headerName)) { - headerFilesUic.insert(this->Headers.begin(), this->Headers.end()); + headerFilesUic.insert(headerName); } } this->ParseHeaders(headerFilesMoc, headerFilesUic, includedMocs, |