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

BUG: fix EXE and LIB path problems

Browse Source
This commit is contained in:
Bill Hoffman 2001-06-05 15:48:09 -04:00
parent b92b025226
commit 8e281e5d5f
2 changed files with 82 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Source/cmDSPMakefile.cxx
View File

@ -474,6 +474,46 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
exePath = m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"); exePath = m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH");
} }
if(libPath.size())
{
// make sure there is a trailing slash
if(libPath[libPath.size()-1] != '/')
{
libPath += "/";
}
libOptions += " /LIBPATH:\"";
libOptions += libPath;
libOptions += "$(IntDir)\" ";
libOptions += " /LIBPATH:\"";
libOptions += libPath;
libOptions += "\" ";
libMultiLineOptions += "# ADD LINK32 /LIBPATH:\"";
libMultiLineOptions += libPath;
libMultiLineOptions += "$(IntDir)\" ";
libMultiLineOptions += " /LIBPATH:\"";
libMultiLineOptions += libPath;
libMultiLineOptions += "\" \n";
}
if(exePath.size())
{
// make sure there is a trailing slash
if(exePath[exePath.size()-1] != '/')
{
exePath += "/";
}
libOptions += " /LIBPATH:\"";
libOptions += exePath;
libOptions += "$(IntDir)\" ";
libOptions += " /LIBPATH:\"";
libOptions += exePath;
libOptions += "\" ";
libMultiLineOptions += "# ADD LINK32 /LIBPATH:\"";
libMultiLineOptions += exePath;
libMultiLineOptions += "$(IntDir)\" ";
libMultiLineOptions += " /LIBPATH:\"";
libMultiLineOptions += exePath;
libMultiLineOptions += "\" \n";
}
std::vector<std::string>::iterator i; std::vector<std::string>::iterator i;
std::vector<std::string>& libdirs = m_Makefile->GetLinkDirectories(); std::vector<std::string>& libdirs = m_Makefile->GetLinkDirectories();
for(i = libdirs.begin(); i != libdirs.end(); ++i) for(i = libdirs.begin(); i != libdirs.end(); ++i)
@ -486,7 +526,7 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
libOptions += "\" "; libOptions += "\" ";
libMultiLineOptions += "# ADD LINK32 /LIBPATH:\""; libMultiLineOptions += "# ADD LINK32 /LIBPATH:\"";
libMultiLineOptions += *i; libMultiLineOptions += *i;
libMultiLineOptions += "/$(OUTDIR)\" "; libMultiLineOptions += "/$(OUTDIR)\" ";
libMultiLineOptions += " /LIBPATH:\""; libMultiLineOptions += " /LIBPATH:\"";
libMultiLineOptions += *i; libMultiLineOptions += *i;

42
Source/cmDSPWriter.cxx
View File

@ -474,6 +474,46 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
exePath = m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"); exePath = m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH");
} }
if(libPath.size())
{
// make sure there is a trailing slash
if(libPath[libPath.size()-1] != '/')
{
libPath += "/";
}
libOptions += " /LIBPATH:\"";
libOptions += libPath;
libOptions += "$(IntDir)\" ";
libOptions += " /LIBPATH:\"";
libOptions += libPath;
libOptions += "\" ";
libMultiLineOptions += "# ADD LINK32 /LIBPATH:\"";
libMultiLineOptions += libPath;
libMultiLineOptions += "$(IntDir)\" ";
libMultiLineOptions += " /LIBPATH:\"";
libMultiLineOptions += libPath;
libMultiLineOptions += "\" \n";
}
if(exePath.size())
{
// make sure there is a trailing slash
if(exePath[exePath.size()-1] != '/')
{
exePath += "/";
}
libOptions += " /LIBPATH:\"";
libOptions += exePath;
libOptions += "$(IntDir)\" ";
libOptions += " /LIBPATH:\"";
libOptions += exePath;
libOptions += "\" ";
libMultiLineOptions += "# ADD LINK32 /LIBPATH:\"";
libMultiLineOptions += exePath;
libMultiLineOptions += "$(IntDir)\" ";
libMultiLineOptions += " /LIBPATH:\"";
libMultiLineOptions += exePath;
libMultiLineOptions += "\" \n";
}
std::vector<std::string>::iterator i; std::vector<std::string>::iterator i;
std::vector<std::string>& libdirs = m_Makefile->GetLinkDirectories(); std::vector<std::string>& libdirs = m_Makefile->GetLinkDirectories();
for(i = libdirs.begin(); i != libdirs.end(); ++i) for(i = libdirs.begin(); i != libdirs.end(); ++i)
@ -486,7 +526,7 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
libOptions += "\" "; libOptions += "\" ";
libMultiLineOptions += "# ADD LINK32 /LIBPATH:\""; libMultiLineOptions += "# ADD LINK32 /LIBPATH:\"";
libMultiLineOptions += *i; libMultiLineOptions += *i;
libMultiLineOptions += "/$(OUTDIR)\" "; libMultiLineOptions += "/$(OUTDIR)\" ";
libMultiLineOptions += " /LIBPATH:\""; libMultiLineOptions += " /LIBPATH:\"";
libMultiLineOptions += *i; libMultiLineOptions += *i;