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

BUG: fix for files with dashes in them

Browse Source
This commit is contained in:
Bill Hoffman 2002-03-14 14:58:28 -05:00
parent 567edf0e9a
commit 15d365cddd
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmNMakeMakefileGenerator.cxx
View File

@ -711,3 +711,11 @@ std::string cmNMakeMakefileGenerator::ConvertToOutputPath(const char* s)
{ {
return cmSystemTools::ConvertToOutputPath(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
Source/cmNMakeMakefileGenerator.h
View File

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