kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CPack fix compile error on VS70 and avoid KWStyle warnings

This commit is contained in:
Eric NOULARD 2011-03-04 22:57:37 +01:00
parent 77333a92c2
commit b813f863e6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/CPack/cmCPackGenerator.cxx
View File

@ -24,6 +24,7 @@
#include <cmsys/SystemTools.hxx> #include <cmsys/SystemTools.hxx>
#include <cmsys/Glob.hxx> #include <cmsys/Glob.hxx>
#include <memory> // auto_ptr #include <memory> // auto_ptr
#include <algorithm>
#if defined(__HAIKU__) #if defined(__HAIKU__)
#include <StorageKit.h> #include <StorageKit.h>
@ -822,7 +823,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
glB.RecurseOn(); glB.RecurseOn();
glB.FindFiles(findExpr); glB.FindFiles(findExpr);
filesBefore = glB.GetFiles(); filesBefore = glB.GetFiles();
sort(filesBefore.begin(),filesBefore.end()); std::sort(filesBefore.begin(),filesBefore.end());
} }
// do installation // do installation
int res = mf->ReadListFile(0, installFile.c_str()); int res = mf->ReadListFile(0, installFile.c_str());
@ -834,10 +835,10 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
glA.RecurseOn(); glA.RecurseOn();
glA.FindFiles(findExpr); glA.FindFiles(findExpr);
std::vector<std::string> filesAfter = glA.GetFiles(); 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>::iterator diff;
std::vector<std::string> result(filesAfter.size()); std::vector<std::string> result(filesAfter.size());
diff = set_difference ( diff = std::set_difference (
filesAfter.begin(),filesAfter.end(), filesAfter.begin(),filesAfter.end(),
filesBefore.begin(),filesBefore.end(), filesBefore.begin(),filesBefore.end(),
result.begin()); result.begin());
@ -847,8 +848,11 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
// Populate the File field of each component // Populate the File field of each component
for (fit=result.begin();fit!=diff;++fit) for (fit=result.begin();fit!=diff;++fit)
{ {
localFileName = cmSystemTools::RelativePath(InstallPrefix, fit->c_str()); localFileName =
localFileName = localFileName.substr(localFileName.find('/')+1,std::string::npos); cmSystemTools::RelativePath(InstallPrefix, fit->c_str());
localFileName =
localFileName.substr(localFileName.find('/')+1,
std::string::npos);
Components[installComponent].Files.push_back(localFileName); Components[installComponent].Files.push_back(localFileName);
cmCPackLogger(cmCPackLog::LOG_DEBUG, "Adding file <" cmCPackLogger(cmCPackLog::LOG_DEBUG, "Adding file <"
<<localFileName<<"> to component <" <<localFileName<<"> to component <"