support for network path link libraries

This commit is contained in:
Ken Martin 2001-08-27 15:19:45 -04:00
parent f709e5588e
commit ba4e56385c

View File

@ -546,11 +546,27 @@ void cmDSPWriter::WriteDSPHeader(std::ostream& fout, const char *libName,
lib += ".lib"; lib += ".lib";
} }
lib = cmSystemTools::EscapeSpaces(lib.c_str()); lib = cmSystemTools::EscapeSpaces(lib.c_str());
// watch for network paths, MSVC can't seem to load //
if (strlen(lib.c_str()) > 2 && lib.c_str()[0] == '/' &&
lib.c_str()[1] == '/')
{
std::string lib2 = "\\\\";
lib2 += (lib.c_str() + 2);
lib = lib2;
}
if (strlen(lib.c_str()) > 3 && lib.c_str()[0] == '"' &&
lib.c_str()[1] == '/' && lib.c_str()[2] == '/')
{
std::string lib2 = "\"\\\\";
lib2 += (lib.c_str() + 3);
lib = lib2;
}
if (j->second == cmTarget::GENERAL) if (j->second == cmTarget::GENERAL)
{ {
libOptions += " "; libOptions += " ";
libOptions += lib; libOptions += lib;
libMultiLineOptions += "# ADD LINK32 "; libMultiLineOptions += "# ADD LINK32 ";
libMultiLineOptions += lib; libMultiLineOptions += lib;
libMultiLineOptions += "\n"; libMultiLineOptions += "\n";
@ -567,7 +583,7 @@ void cmDSPWriter::WriteDSPHeader(std::ostream& fout, const char *libName,
if (j->second == cmTarget::OPTIMIZED) if (j->second == cmTarget::OPTIMIZED)
{ {
libOptimizedOptions += " "; libOptimizedOptions += " ";
libOptimizedOptions += lib; libOptimizedOptions += lib;
libMultiLineOptimizedOptions += "# ADD LINK32 "; libMultiLineOptimizedOptions += "# ADD LINK32 ";
libMultiLineOptimizedOptions += lib; libMultiLineOptimizedOptions += lib;