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 eb92381eb6cb509b5f64f295a2ed85ff16b17e43 (commit) via b813f863e6ba9fca7ba216810564c268099db16c (commit) from 44c437ea65b58ed05f9e2ba80c2471dc0f852dbf (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=eb92381eb6cb509b5f64f295a2ed85ff16b17e43 commit eb92381eb6cb509b5f64f295a2ed85ff16b17e43 Merge: 44c437e b813f86 Author: Eric Noulard <eric.noul...@gmail.com> AuthorDate: Fri Mar 4 16:58:31 2011 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Mar 4 16:58:31 2011 -0500 Merge topic 'CPack-MoreRobustComponentFileList' into next b813f86 CPack fix compile error on VS70 and avoid KWStyle warnings http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b813f863e6ba9fca7ba216810564c268099db16c commit b813f863e6ba9fca7ba216810564c268099db16c Author: Eric NOULARD <eric.noul...@gmail.com> AuthorDate: Fri Mar 4 22:57:37 2011 +0100 Commit: Eric NOULARD <eric.noul...@gmail.com> CommitDate: Fri Mar 4 22:57:37 2011 +0100 CPack fix compile error on VS70 and avoid KWStyle warnings diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 2cc2f34..5f314c6 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -24,6 +24,7 @@ #include <cmsys/SystemTools.hxx> #include <cmsys/Glob.hxx> #include <memory> // auto_ptr +#include <algorithm> #if defined(__HAIKU__) #include <StorageKit.h> @@ -822,7 +823,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( glB.RecurseOn(); glB.FindFiles(findExpr); filesBefore = glB.GetFiles(); - sort(filesBefore.begin(),filesBefore.end()); + std::sort(filesBefore.begin(),filesBefore.end()); } // do installation int res = mf->ReadListFile(0, installFile.c_str()); @@ -834,10 +835,10 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( glA.RecurseOn(); glA.FindFiles(findExpr); std::vector<std::string> filesAfter = glA.GetFiles(); - sort(filesAfter.begin(),filesAfter.end()); + std::sort(filesAfter.begin(),filesAfter.end()); std::vector<std::string>::iterator diff; std::vector<std::string> result(filesAfter.size()); - diff = set_difference ( + diff = std::set_difference ( filesAfter.begin(),filesAfter.end(), filesBefore.begin(),filesBefore.end(), result.begin()); @@ -847,8 +848,11 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( // Populate the File field of each component for (fit=result.begin();fit!=diff;++fit) { - localFileName = cmSystemTools::RelativePath(InstallPrefix, fit->c_str()); - localFileName = localFileName.substr(localFileName.find('/')+1,std::string::npos); + localFileName = + cmSystemTools::RelativePath(InstallPrefix, fit->c_str()); + localFileName = + localFileName.substr(localFileName.find('/')+1, + std::string::npos); Components[installComponent].Files.push_back(localFileName); cmCPackLogger(cmCPackLog::LOG_DEBUG, "Adding file <" <<localFileName<<"> to component <" ----------------------------------------------------------------------- Summary of changes: Source/CPack/cmCPackGenerator.cxx | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits