Browse Source

BUG: fix for files with dashes in them

Bill Hoffman 24 years ago
parent
commit
15d365cddd
2 changed files with 11 additions and 0 deletions
  1. 8 0
      Source/cmNMakeMakefileGenerator.cxx
  2. 3 0
      Source/cmNMakeMakefileGenerator.h

+ 8 - 0
Source/cmNMakeMakefileGenerator.cxx

@@ -711,3 +711,11 @@ std::string cmNMakeMakefileGenerator::ConvertToOutputPath(const char* s)
 {
   return cmSystemTools::ConvertToOutputPath(s);
 }
+
+
+std::string cmNMakeMakefileGenerator::CreateMakeVariable(const char* s, const char* s2)
+{
+  std::string ret=  std::string(s) + std::string(s2);
+  cmSystemTools::ReplaceString(ret, "-", "_");
+  return ret;
+}

+ 3 - 0
Source/cmNMakeMakefileGenerator.h

@@ -87,6 +87,9 @@ protected:
   void SetLibraryPathOption(const char* lib){ m_LibraryPathOption = lib;}
   void SetLibraryLinkOption(const char* lib){ m_LibraryLinkOption = lib;}
   virtual std::string ConvertToOutputPath(const char* s);
+
+  virtual std::string CreateMakeVariable(const char* s, const char* s2);
+
 private:
   std::string m_LibraryPathOption;// option to specifiy a link path -LIBPATH 
   std::string m_LibraryLinkOption; // option to specify a library (like -l, empty for nmake)