summaryrefslogtreecommitdiffstats
path: root/Source/cmNMakeMakefileGenerator.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2002-04-19 16:49:11 (GMT)
committerKen Martin <ken.martin@kitware.com>2002-04-19 16:49:11 (GMT)
commit55821b28679ac9e4de5d279425e9b2c3959cf34f (patch)
tree75f38697690894fe62c774440cfaa93cb984277d /Source/cmNMakeMakefileGenerator.cxx
parent89a697a3b9e9a4ec6f54f3b24130fc86cd9d29f7 (diff)
downloadCMake-55821b28679ac9e4de5d279425e9b2c3959cf34f.zip
CMake-55821b28679ac9e4de5d279425e9b2c3959cf34f.tar.gz
CMake-55821b28679ac9e4de5d279425e9b2c3959cf34f.tar.bz2
renamed unix to unixPath for compile error
Diffstat (limited to 'Source/cmNMakeMakefileGenerator.cxx')
-rw-r--r--Source/cmNMakeMakefileGenerator.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmNMakeMakefileGenerator.cxx b/Source/cmNMakeMakefileGenerator.cxx
index f70f7c6..d140fec 100644
--- a/Source/cmNMakeMakefileGenerator.cxx
+++ b/Source/cmNMakeMakefileGenerator.cxx
@@ -86,12 +86,12 @@ std::string cmNMakeMakefileGenerator::ShortPathCommand(const char* command)
{
c = removeIntDir.match(1) + removeIntDir.match(3);
}
- std::string unix = c;
+ std::string unixPath = c;
// since the command may already be a windows path, convert it
// to unix so we can use SplitProgramPath on it.
- cmSystemTools::ConvertToUnixSlashes(unix);
+ cmSystemTools::ConvertToUnixSlashes(unixPath);
std::string path, file;
- cmSystemTools::SplitProgramPath(unix.c_str(), path, file);
+ cmSystemTools::SplitProgramPath(unixPath.c_str(), path, file);
// do a short path on the directory, because ShortPath will
// not work for files that do not exist
path = this->ShortPath(path.c_str());