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

COMP: Need to use cmsys_stl when in CMake code, not kwsys_stl.

This commit is contained in:
Brad King 2006-08-27 13:15:39 -04:00
parent 703c0e32c8
commit 2b602ea738
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CPack/cmCPackNSISGenerator.cxx
View File

@ -248,7 +248,7 @@ bool cmCPackNSISGenerator::GetListOfSubdirectories(const char* topdir,
if (strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)),".") && if (strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)),".") &&
strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)),"..")) strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)),".."))
{ {
kwsys_stl::string fullPath = topdir; cmsys_stl::string fullPath = topdir;
fullPath += "/"; fullPath += "/";
fullPath += dir.GetFile(static_cast<unsigned long>(fileNum)); fullPath += dir.GetFile(static_cast<unsigned long>(fileNum));
if(cmsys::SystemTools::FileIsDirectory(fullPath.c_str()) && if(cmsys::SystemTools::FileIsDirectory(fullPath.c_str()) &&

6
Source/cmFileCommand.cxx
View File

@ -575,12 +575,12 @@ bool cmFileInstaller::InstallDirectory(const char* source,
if(!(strcmp(dir.GetFile(fileNum), ".") == 0 || if(!(strcmp(dir.GetFile(fileNum), ".") == 0 ||
strcmp(dir.GetFile(fileNum), "..") == 0)) strcmp(dir.GetFile(fileNum), "..") == 0))
{ {
kwsys_stl::string fromPath = source; cmsys_stl::string fromPath = source;
fromPath += "/"; fromPath += "/";
fromPath += dir.GetFile(fileNum); fromPath += dir.GetFile(fileNum);
if(cmSystemTools::FileIsDirectory(fromPath.c_str())) if(cmSystemTools::FileIsDirectory(fromPath.c_str()))
{ {
kwsys_stl::string toDir = destination; cmsys_stl::string toDir = destination;
toDir += "/"; toDir += "/";
toDir += dir.GetFile(fileNum); toDir += dir.GetFile(fileNum);
if(!this->InstallDirectory(fromPath.c_str(), toDir.c_str(), always)) if(!this->InstallDirectory(fromPath.c_str(), toDir.c_str(), always))
@ -1336,7 +1336,7 @@ void cmFileCommand::ComputeVersionedName(std::string& name,
{ {
#if defined(__APPLE__) #if defined(__APPLE__)
std::string ext; std::string ext;
kwsys_stl::string::size_type dot_pos = name.rfind("."); cmsys_stl::string::size_type dot_pos = name.rfind(".");
if(dot_pos != name.npos) if(dot_pos != name.npos)
{ {
ext = name.substr(dot_pos, name.npos); ext = name.substr(dot_pos, name.npos);