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

ENH: change to take a path as input

This commit is contained in:
Bill Hoffman 2001-09-17 16:36:04 -04:00
parent 11269bb1c4
commit 73b42d882c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmUseMangledMesaCommand.cxx
View File

@ -54,22 +54,20 @@ bool cmUseMangledMesaCommand::InitialPass(std::vector<std::string>& args)
} }
m_Makefile->ExpandVariablesInString(args[0]); m_Makefile->ExpandVariablesInString(args[0]);
m_Makefile->ExpandVariablesInString(args[1]); 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(); const char* destDir = args[1].c_str();
std::string dir, file;
cmSystemTools::SplitProgramPath(inputFileName, dir, file);
std::vector<std::string> files; std::vector<std::string> files;
cmSystemTools::Glob(dir.c_str(), "\\.h$", files); cmSystemTools::Glob(inputDir, "\\.h$", files);
if(files.size() == 0) if(files.size() == 0)
{ {
cmSystemTools::Error("Could not open Mesa Directory ", dir.c_str()); cmSystemTools::Error("Could not open Mesa Directory ", inputDir);
return false; return false;
} }
cmSystemTools::MakeDirectory(destDir); cmSystemTools::MakeDirectory(destDir);
for(std::vector<std::string>::iterator i = files.begin(); for(std::vector<std::string>::iterator i = files.begin();
i != files.end(); ++i) i != files.end(); ++i)
{ {
std::string path = dir.c_str(); std::string path = inputDir;
path += "/"; path += "/";
path += *i; path += *i;
this->CopyAndFullPathMesaHeader(path.c_str(), destDir); this->CopyAndFullPathMesaHeader(path.c_str(), destDir);

2
Source/cmUseMangledMesaCommand.h
View File

@ -46,7 +46,7 @@ public:
virtual const char* GetFullDocumentation() virtual const char* GetFullDocumentation()
{ {
return return
"USE_MANGLED_MESA(\"path to gl_mangle.h\"" "USE_MANGLED_MESA(\"path to mesa includes, should contain gl_mangle.h\""
" \"directory for output\" )"; " \"directory for output\" )";
} }