summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2001-09-17 20:36:04 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2001-09-17 20:36:04 (GMT)
commit73b42d882c05d802f4deb85a6ad5c534dc7de611 (patch)
tree69ca8507d257de738874c27206034f8b35682850 /Source
parent11269bb1c49144d5e0ec6c3382adda679e91c261 (diff)
downloadCMake-73b42d882c05d802f4deb85a6ad5c534dc7de611.zip
CMake-73b42d882c05d802f4deb85a6ad5c534dc7de611.tar.gz
CMake-73b42d882c05d802f4deb85a6ad5c534dc7de611.tar.bz2
ENH: change to take a path as input
Diffstat (limited to 'Source')
-rw-r--r--Source/cmUseMangledMesaCommand.cxx10
-rw-r--r--Source/cmUseMangledMesaCommand.h2
2 files changed, 5 insertions, 7 deletions
diff --git a/Source/cmUseMangledMesaCommand.cxx b/Source/cmUseMangledMesaCommand.cxx
index 1422db5..2c70aa8 100644
--- a/Source/cmUseMangledMesaCommand.cxx
+++ b/Source/cmUseMangledMesaCommand.cxx
@@ -54,22 +54,20 @@ bool cmUseMangledMesaCommand::InitialPass(std::vector<std::string>& args)
}
m_Makefile->ExpandVariablesInString(args[0]);
m_Makefile->ExpandVariablesInString(args[1]);
- const char* inputFileName = args[0].c_str();
+ const char* inputDir = args[0].c_str();
const char* destDir = args[1].c_str();
- std::string dir, file;
- cmSystemTools::SplitProgramPath(inputFileName, dir, file);
std::vector<std::string> files;
- cmSystemTools::Glob(dir.c_str(), "\\.h$", files);
+ cmSystemTools::Glob(inputDir, "\\.h$", files);
if(files.size() == 0)
{
- cmSystemTools::Error("Could not open Mesa Directory ", dir.c_str());
+ cmSystemTools::Error("Could not open Mesa Directory ", inputDir);
return false;
}
cmSystemTools::MakeDirectory(destDir);
for(std::vector<std::string>::iterator i = files.begin();
i != files.end(); ++i)
{
- std::string path = dir.c_str();
+ std::string path = inputDir;
path += "/";
path += *i;
this->CopyAndFullPathMesaHeader(path.c_str(), destDir);
diff --git a/Source/cmUseMangledMesaCommand.h b/Source/cmUseMangledMesaCommand.h
index 4fbf1e4..6db3d2d 100644
--- a/Source/cmUseMangledMesaCommand.h
+++ b/Source/cmUseMangledMesaCommand.h
@@ -46,7 +46,7 @@ public:
virtual const char* GetFullDocumentation()
{
return
- "USE_MANGLED_MESA(\"path to gl_mangle.h\""
+ "USE_MANGLED_MESA(\"path to mesa includes, should contain gl_mangle.h\""
" \"directory for output\" )";
}