Browse Source

ENH: change to take a path as input

Bill Hoffman 24 years ago
parent
commit
73b42d882c
2 changed files with 5 additions and 7 deletions
  1. 4 6
      Source/cmUseMangledMesaCommand.cxx
  2. 1 1
      Source/cmUseMangledMesaCommand.h

+ 4 - 6
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);

+ 1 - 1
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\"  )";
     }