This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 2fd6d081371b9359cbba6bf14abfea5ebe7784bf (commit) via 0468cb7eae44a38dbd8cb4623cb7f611566bef20 (commit) from e873c338814302fc47a4bb7c85fb05d8b3420e42 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fd6d081371b9359cbba6bf14abfea5ebe7784bf commit 2fd6d081371b9359cbba6bf14abfea5ebe7784bf Merge: e873c33 0468cb7 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Jan 8 16:35:00 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Jan 8 16:35:00 2014 -0500 Merge topic 'minor-cleanups' into next 0468cb7 Windows build fixes. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0468cb7eae44a38dbd8cb4623cb7f611566bef20 commit 0468cb7eae44a38dbd8cb4623cb7f611566bef20 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Jan 8 22:34:26 2014 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed Jan 8 22:34:26 2014 +0100 Windows build fixes. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 6443434..f7a42fc 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1361,7 +1361,8 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases, postbuild.push_back(command); } - std::vector<cmSourceFile*>const &classes = cmtarget.GetSourceFiles(); + std::vector<cmSourceFile*> classes; + cmtarget.GetSourceFiles(classes); // add all the sources std::vector<cmCustomCommand> commands; for(std::vector<cmSourceFile*>::const_iterator i = classes.begin(); diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 428e185..62fc16f 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1884,7 +1884,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences() bool cmVisualStudio10TargetGenerator:: IsResxHeader(const std::string& headerFile) { - std::set<std::string>::iterator it = + std::set<std::string>::const_iterator it = this->GeneratorTarget->GetExpectedResxHeaders().find(headerFile); return it != this->GeneratorTarget->GetExpectedResxHeaders().end(); ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalXCodeGenerator.cxx | 3 ++- Source/cmVisualStudio10TargetGenerator.cxx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits