From 73b42d882c05d802f4deb85a6ad5c534dc7de611 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Mon, 17 Sep 2001 16:36:04 -0400 Subject: [PATCH] ENH: change to take a path as input --- Source/cmUseMangledMesaCommand.cxx | 10 ++++------ Source/cmUseMangledMesaCommand.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Source/cmUseMangledMesaCommand.cxx b/Source/cmUseMangledMesaCommand.cxx index 1422db524..2c70aa8ed 100644 --- a/Source/cmUseMangledMesaCommand.cxx +++ b/Source/cmUseMangledMesaCommand.cxx @@ -54,22 +54,20 @@ bool cmUseMangledMesaCommand::InitialPass(std::vector& 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 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::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 4fbf1e4bd..6db3d2d72 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\" )"; }